PatchSet 5542
Date: 2005/02/14 21:05:36
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: serialization cleanup
2005-02-14 Dalibor Topic <[EMAIL PROTECTED]>
Resynced with GNU Classpath.
2005-02-13 Mark Wielaard <[EMAIL PROTECTED]>
# Fixes bug #11957
* java/io/ObjectInputStream.java (resolveClass): Don't check void
twice.
Members:
ChangeLog:1.3586->1.3587
libraries/javalib/java/io/ObjectInputStream.java:1.48->1.49
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3586 kaffe/ChangeLog:1.3587
--- kaffe/ChangeLog:1.3586 Mon Feb 14 21:01:52 2005
+++ kaffe/ChangeLog Mon Feb 14 21:05:36 2005
@@ -2,6 +2,16 @@
Resynced with GNU Classpath.
+ 2005-02-13 Mark Wielaard <[EMAIL PROTECTED]>
+
+ # Fixes bug #11957
+ * java/io/ObjectInputStream.java (resolveClass): Don't check "void"
+ twice.
+
+2005-02-14 Dalibor Topic <[EMAIL PROTECTED]>
+
+ Resynced with GNU Classpath.
+
2005-02-13 Tom Tromey <[EMAIL PROTECTED]>
* gnu/xml/aelfred2/SAXDriver.java: Ensure that null is returned when
Index: kaffe/libraries/javalib/java/io/ObjectInputStream.java
diff -u kaffe/libraries/javalib/java/io/ObjectInputStream.java:1.48
kaffe/libraries/javalib/java/io/ObjectInputStream.java:1.49
--- kaffe/libraries/javalib/java/io/ObjectInputStream.java:1.48 Wed Feb 2
23:16:12 2005
+++ kaffe/libraries/javalib/java/io/ObjectInputStream.java Mon Feb 14
21:05:47 2005
@@ -766,8 +766,6 @@
return Float.TYPE;
if (name.equals("double"))
return Double.TYPE;
- if (name.equals("void"))
- return Void.TYPE;
throw cnfe;
}
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
