harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmar...@apache.org
Subject svn commit: r606736 - /harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectOutputStream.java
Date Mon, 24 Dec 2007 20:20:29 GMT
Author: mmarkov
Date: Mon Dec 24 12:20:28 2007
New Revision: 606736

URL: http://svn.apache.org/viewvc?rev=606736&view=rev
Log:
There are cases when primitiveTypes stream is not null while primitiveTypesBuffer is leading
to NPE in ObjectOutputStream.drain() method. Fixing this.

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

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectOutputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectOutputStream.java?rev=606736&r1=606735&r2=606736&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectOutputStream.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectOutputStream.java
Mon Dec 24 12:20:28 2007
@@ -316,7 +316,7 @@
      *             If an error occurs attempting to drain the data
      */
     protected void drain() throws IOException {
-        if (primitiveTypes == null) {
+        if (primitiveTypes == null || primitiveTypesBuffer == null) {
             return;
         }
 



Mime
View raw message