commit 39f14561c0eac60eeb2760b131d1103df78038c8
author Jing Lv <lvjing@apache.org> Mon Feb 08 13:54:03 2010 +0000
committer Jing Lv <lvjing@apache.org> Mon Feb 08 13:54:03 2010 +0000
tree 72d6f0f8bd485d58b688c3ae4ee9828c2d919912
parent ced814f02c1e5c2455beb7976d9ef0b0a81928f7

Apply patch for HARMONY-6439 [classlib][luni] NullPointerException thrown in certain Serialization cases

git-svn-id: https://svn.apache.org/repos/asf/harmony/enhanced/classlib/trunk@907657 13f79535-47bb-0310-9956-ffa450edef68

modules/luni/src/main/java/java/io/ObjectStreamField.java

diff --git a/modules/luni/src/main/java/java/io/ObjectStreamField.java b/modules/luni/src/main/java/java/io/ObjectStreamField.java
index c208b77..65b772d 100644
--- a/modules/luni/src/main/java/java/io/ObjectStreamField.java
+++ b/modules/luni/src/main/java/java/io/ObjectStreamField.java
@@ -333,6 +333,10 @@
     }
 
     void resolve(ClassLoader loader) {
+        if (typeString == null && isPrimitive()){
+            // primitive type declared in a serializable class
+            typeString = String.valueOf(getTypeCode());
+        }
         if (typeString.length() == 1) {
             switch (typeString.charAt(0)) {
                 case 'I':