harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r984367 - in /harmony/enhanced/java/trunk/classlib/modules/luni/src: main/java/java/io/ObjectInputStream.java test/api/common/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java
Date Wed, 11 Aug 2010 10:51:27 GMT
Author: hindessm
Date: Wed Aug 11 10:51:26 2010
New Revision: 984367

URL: http://svn.apache.org/viewvc?rev=984367&view=rev
Log:
Add test and fix for "[#HARMONY-6614] ObjectInputStream's primitive mapping
table misses void/void.class".

Modified:
    harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/io/ObjectInputStream.java
    harmony/enhanced/java/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/io/ObjectInputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/io/ObjectInputStream.java?rev=984367&r1=984366&r2=984367&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/io/ObjectInputStream.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/io/ObjectInputStream.java
Wed Aug 11 10:51:26 2010
@@ -117,6 +117,7 @@ public class ObjectInputStream extends I
         PRIMITIVE_CLASSES.put("char", char.class); //$NON-NLS-1$
         PRIMITIVE_CLASSES.put("float", float.class); //$NON-NLS-1$
         PRIMITIVE_CLASSES.put("double", double.class); //$NON-NLS-1$
+        PRIMITIVE_CLASSES.put("void", void.class); //$NON-NLS-1$
     }
 
     private ObjectAccessor accessor = AccessorFactory.getObjectAccessor();

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java?rev=984367&r1=984366&r2=984367&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java
Wed Aug 11 10:51:26 2010
@@ -1215,7 +1215,8 @@ class Test implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	Class classes[] = new Class[] { byte.class, short.class, int.class,
-			long.class, boolean.class, char.class, float.class, double.class };
+			long.class, boolean.class, char.class, float.class,
+                        double.class, void.class };
 
 	@Override
     public boolean equals(Object o) {



Mime
View raw message