[kaffe] CVS kaffe (dalibor): Resynced with GNU Classpath: java/io/ObjectInputStream.java

[Kaffe CVS]

PatchSet 4819 
Date: 2004/06/03 21:57:02
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: java/io/ObjectInputStream.java

2004-06-03  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/io/ObjectInputStream.java:
         Resynced with GNU Classpath.

        2004-06-03  Michael Koch  <konqueror at gmx.de>

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

Members: 
	ChangeLog:1.2387->1.2388 
	libraries/javalib/java/io/ObjectInputStream.java:1.36->1.37 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2387 kaffe/ChangeLog:1.2388
--- kaffe/ChangeLog:1.2387	Thu Jun  3 21:38:50 2004
+++ kaffe/ChangeLog	Thu Jun  3 21:57:02 2004
@@ -1,5 +1,15 @@
 2004-06-03  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/java/io/ObjectInputStream.java:
+	 Resynced with GNU Classpath.
+
+	2004-06-03  Michael Koch  <konqueror at gmx.de>
+
+        * java/io/ObjectInputStream.java (readFields): Use long datatype
+        when shifting byte values more then 24 bits left.
+
+2004-06-03  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/java/io/RandomAccessFile.java:
 	Resynced with GNU Classpath.
 
Index: kaffe/libraries/javalib/java/io/ObjectInputStream.java
diff -u kaffe/libraries/javalib/java/io/ObjectInputStream.java:1.36 kaffe/libraries/javalib/java/io/ObjectInputStream.java:1.37
--- kaffe/libraries/javalib/java/io/ObjectInputStream.java:1.36	Mon Apr 12 11:40:26 2004
+++ kaffe/libraries/javalib/java/io/ObjectInputStream.java	Thu Jun  3 21:57:05 2004
@@ -1303,10 +1303,10 @@
 
 	  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)
@@ -1340,10 +1340,10 @@
 	  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)