harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From py...@apache.org
Subject svn commit: r526665 - /harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java
Date Mon, 09 Apr 2007 07:44:31 GMT
Author: pyang
Date: Mon Apr  9 00:44:30 2007
New Revision: 526665

URL: http://svn.apache.org/viewvc?view=rev&rev=526665
Log:
Apply patch for HARMONY-3566( [classlib][luni]the readObjectOverride() mechanism for subclasses
of java.io.ObjectInputStream does not work correctly)

Modified:
    harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java?view=diff&rev=526665&r1=526664&r2=526665
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java
Mon Apr  9 00:44:30 2007
@@ -2100,9 +2100,6 @@
 
     private Object readObject(boolean unshared) throws OptionalDataException,
             ClassNotFoundException, IOException {
-        if (input == null) {
-            return null;
-        }
         boolean restoreInput = (primitiveData == input);
         if (restoreInput) {
             primitiveData = emptyStream;



Mime
View raw message