harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r426495 - in /incubator/harmony/enhanced/classlib/trunk/modules/luni: build.xml src/main/java/java/io/ObjectOutputStream.java
Date Fri, 28 Jul 2006 13:12:21 GMT
Author: smishura
Date: Fri Jul 28 06:12:20 2006
New Revision: 426495

URL: http://svn.apache.org/viewvc?rev=426495&view=rev
Log:
Apply patch for HARMONY-851 ([classlib][luni] ObjectOutputStream.writeObject() no expected
NotSerializableException)

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

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=426495&r1=426494&r2=426495&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml Fri Jul 28 06:12:20 2006
@@ -397,7 +397,6 @@
                     <exclude name="tests/api/java/lang/IllegalThreadStateExceptionTest.java"
/>
                     <exclude name="tests/api/java/lang/ThreadTest.java" />
                     <exclude name="tests/api/java/io/InputStreamReaderTest.java" />
-                    <exclude name="tests/api/java/io/ObjectOutputStreamTest.java" />
                     <exclude name="tests/api/java/io/OutputStreamWriterTest.java" />
                     <exclude name="tests/api/java/io/PipedInputStreamTest.java" />
                     <exclude name="tests/api/java/lang/AssertionErrorTest.java" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectOutputStream.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectOutputStream.java?rev=426495&r1=426494&r2=426495&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectOutputStream.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectOutputStream.java
Fri Jul 28 06:12:20 2006
@@ -1750,6 +1750,9 @@
 
 	private void writeObject(Object object, boolean unshared)
 			throws IOException {
+		if (object != null && !ObjectStreamClass.isSerializable(object.getClass())) {
+			throw new NotSerializableException(object.getClass().getName());
+		}
 		boolean setOutput = (primitiveTypes == output);
 		if (setOutput) {
 			primitiveTypes = null;



Mime
View raw message