You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2006/03/27 16:24:43 UTC
svn commit: r389154 - in
/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io:
ObjectInputStream.java ObjectOutputStream.java ObjectStreamField.java
Author: tellison
Date: Mon Mar 27 06:24:41 2006
New Revision: 389154
URL: http://svn.apache.org/viewcvs?rev=389154&view=rev
Log:
Fix for HARMONY-167 (java.io.ObjectStreamField.getUnshared() should be isUnshared())
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectOutputStream.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectStreamField.java
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java?rev=389154&r1=389153&r2=389154&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java Mon Mar 27 06:24:41 2006
@@ -1121,7 +1121,7 @@
mustResolve = false;
}
Object toSet;
- if (field != null && field.getUnshared())
+ if (field != null && field.isUnshared())
toSet = readUnshared();
else
toSet = readObject();
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectOutputStream.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectOutputStream.java?rev=389154&r1=389153&r2=389154&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 Mon Mar 27 06:24:41 2006
@@ -1230,7 +1230,7 @@
// Object type (array included).
Object field = getFieldObj(obj, declaringClass, fieldDesc
.getName(), fieldDesc.getTypeString());
- if (fieldDesc.getUnshared()) {
+ if (fieldDesc.isUnshared()) {
writeUnshared(field);
} else
writeObject(field);
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectStreamField.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectStreamField.java?rev=389154&r1=389153&r2=389154&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectStreamField.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectStreamField.java Mon Mar 27 06:24:41 2006
@@ -334,7 +334,12 @@
}
}
- boolean getUnshared() {
+ /**
+ * Answers whether this serialized field is unshared.
+ *
+ * @return true if the field is unshared, false otherwise.
+ */
+ boolean isUnshared() {
return unshared;
}
}