The byte array element when shifted is only in an 'int' scope I believe,

so when it's shifted by more than 24, it goes off the end.

My solution is to break in two parts and then shift them on top once they're
in a long scope.


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/io/trunk@140433 13f79535-47bb-0310-9956-ffa450edef68

Author: hen

src/java/org/apache/commons/io/EndianUtils.java

@@ -64,7 +64,7 @@
  * Origin of code: Apache Avalon (Excalibur)
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @version CVS $Revision: 1.5 $ $Date: 2003/11/27 02:58:10 $
+ * @version CVS $Revision: 1.6 $ $Date: 2003/11/27 04:07:09 $
  */
 public final class EndianUtils
 {
@@ -250,14 +250,17 @@ public static void writeSwappedLong( final byte[] data, final int offset, final
      */
     public static long readSwappedLong( final byte[] data, final int offset )
     {
-        return (long)( ( ( data[ offset + 0 ] & 0xff ) << 0 ) +
+        long ln = (long)( ( ( data[ offset + 0 ] & 0xff ) << 0 ) );
+        long low = (long)( ( ( data[ offset + 0 ] & 0xff ) << 0 ) +
             ( ( data[ offset + 1 ] & 0xff ) << 8 ) +
             ( ( data[ offset + 2 ] & 0xff ) << 16 ) +
-            ( ( data[ offset + 3 ] & 0xff ) << 24 ) +
-            ( ( data[ offset + 4 ] & 0xff ) << 32 ) +
-            ( ( data[ offset + 5 ] & 0xff ) << 40 ) +
-            ( ( data[ offset + 6 ] & 0xff ) << 48 ) +
-            ( ( data[ offset + 7 ] & 0xff ) << 56 ) );
+            ( ( data[ offset + 3 ] & 0xff ) << 24 ) );
+        long high = (long)(
+            ( ( data[ offset + 4 ] & 0xff ) << 0 ) +
+            ( ( data[ offset + 5 ] & 0xff ) << 8 ) +
+            ( ( data[ offset + 6 ] & 0xff ) << 16 ) +
+            ( ( data[ offset + 7 ] & 0xff ) << 24 ) );
+        return low + (high << 32);
     }
 
     /**