Merge with libgcj.

        * java/io/ObjectStreamClass.java (isProxyClass): Now a field.
        (setClass): Throws InvalidClassException.
        (setSuperclass): Use getClassUID if not a proxy Class.
        (setFields): Make sure to call setAccessible(true).
        (setUID): Renamed to...
        (getClassUID): Return the uid. Call setAccessible(true) for field.
        Fall back to Gnu provider SHA algorithm if necessary.
        (getDefinedSUID): Removed method.
        (hasClassInitializer): Don't throw NoSuchMethodError.
        (static): Removed.
        * java/io/ObjectOutputStream.java (writeObject): Use isProxyClass.

1 files changed, 1 insertions, 1 deletions

diff --git a/java/io/ObjectOutputStream.java b/java/io/ObjectOutputStream.java
index c3daa50a4..b497e6e88 100644
--- a/java/io/ObjectOutputStream.java
+++ b/java/io/ObjectOutputStream.java
@@ -206,7 +206,7 @@ public class ObjectOutputStream extends OutputStream
 		ObjectStreamClass osc = ObjectStreamClass.lookupForClassObject (cl);
 		assignNewHandle (obj);
 		realOutput.writeByte (TC_CLASS);
-		if (!osc.isProxyClass ())
+		if (!osc.isProxyClass)
 		  {
 		    writeObject (osc);
 		  }