2004-07-09 Michael Koch <konqueror@gmx.de>

	* java/io/ObjectInputStream.java (readFields): Use long datatype
	when shifting byte values more then 24 bits left.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@84382 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d78d273..b7eea96 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,10 @@
 2004-07-09  Michael Koch  <konqueror@gmx.de>
 
+       * java/io/ObjectInputStream.java (readFields): Use long datatype
+       when shifting byte values more then 24 bits left.
+
+2004-07-09  Michael Koch  <konqueror@gmx.de>
+
        * java/util/zip/DeflaterOutputStream.java,
        java/util/zip/GZIPInputStream.java,
        java/util/zip/GZIPOutputStream.java,

diff --git a/libjava/java/io/ObjectInputStream.java b/libjava/java/io/ObjectInputStream.java
index 292f841..809e9b1 100644 (file)
--- a/libjava/java/io/ObjectInputStream.java
+++ b/libjava/java/io/ObjectInputStream.java
@@ -1332,10 +1332,10 @@ public class ObjectInputStream extends InputStream
 
          int off = field.getOffset();
 
-         return (long)(((prim_field_data[off++] & 0xFF) << 56)
-                       | ((prim_field_data[off++] & 0xFF) << 48)
-                       | ((prim_field_data[off++] & 0xFF) << 40)
-                       | ((prim_field_data[off++] & 0xFF) << 32)
+         return (long)(((prim_field_data[off++] & 0xFFL) << 56)
+                       | ((prim_field_data[off++] & 0xFFL) << 48)
+                       | ((prim_field_data[off++] & 0xFFL) << 40)
+                       | ((prim_field_data[off++] & 0xFFL) << 32)
                        | ((prim_field_data[off++] & 0xFF) << 24)
                        | ((prim_field_data[off++] & 0xFF) << 16)
                        | ((prim_field_data[off++] & 0xFF) << 8)
@@ -1369,10 +1369,10 @@ public class ObjectInputStream extends InputStream
          int off = field.getOffset();
 
          return Double.longBitsToDouble
-           ( (long) (((prim_field_data[off++] & 0xFF) << 56)
-                     | ((prim_field_data[off++] & 0xFF) << 48)
-                     | ((prim_field_data[off++] & 0xFF) << 40)
-                     | ((prim_field_data[off++] & 0xFF) << 32)
+           ( (long) (((prim_field_data[off++] & 0xFFL) << 56)
+                     | ((prim_field_data[off++] & 0xFFL) << 48)
+                     | ((prim_field_data[off++] & 0xFFL) << 40)
+                     | ((prim_field_data[off++] & 0xFFL) << 32)
                      | ((prim_field_data[off++] & 0xFF) << 24)
                      | ((prim_field_data[off++] & 0xFF) << 16)
                      | ((prim_field_data[off++] & 0xFF) << 8)