[cp-patches] FYI: Fix for gnu/java/rmi/server/ActivatableRef.java

[Jeroen Frijters]

Hi,

Committed. This fix isn't perfect, but it's better than the current
code.

Regards,
Jeroen

2006-09-14  Jeroen Frijters  <[EMAIL PROTECTED]>

        * gnu/java/rmi/server/ActivatableRef.java
        (readExternal, writeExternal): Partial fix for serialization
format.

Index: gnu/java/rmi/server/ActivatableRef.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/rmi/server/ActivatableRef.java,v
retrieving revision 1.1
diff -u -r1.1 ActivatableRef.java
--- gnu/java/rmi/server/ActivatableRef.java     29 Mar 2006 13:10:10 -0000      
1.1
+++ gnu/java/rmi/server/ActivatableRef.java     13 Sep 2006 05:34:18 -0000
@@ -112,8 +112,10 @@
   public void readExternal(ObjectInput in) throws IOException,
       ClassNotFoundException
   {
-    super.readExternal(in);
     actId = (ActivationID) in.readObject();
+    String type = in.readUTF();
+    // XXX handle type.equals("") (null reference)
+    super.readExternal(in);
   }
 
   /**
@@ -121,8 +123,10 @@
    */
   public void writeExternal(ObjectOutput out) throws IOException
   {
-    super.writeExternal(out);
     out.writeObject(actId);
+    // XXX write a "" if the "nested" reference is a null reference
+    out.writeUTF("UnicastRef2");
+    super.writeExternal(out);
   }
   
   /**