diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-10-05 02:44:18 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-10-05 02:44:18 +0000 |
| commit | 2799793789d5b66c90efbd1a3eb56e0c1ec57f88 (patch) | |
| tree | 9157197f502b6830af9cafe029fd3d47628a7ed6 /gnu/java/rmi | |
| parent | 7516107c5abe26f7a4378017344eb9e449ebc28e (diff) | |
| download | classpath-2799793789d5b66c90efbd1a3eb56e0c1ec57f88.tar.gz | |
2006-10-05 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge of HEAD-->generics for 2006/09/03-2006/10/04.
Diffstat (limited to 'gnu/java/rmi')
| -rw-r--r-- | gnu/java/rmi/server/ActivatableRef.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gnu/java/rmi/server/ActivatableRef.java b/gnu/java/rmi/server/ActivatableRef.java index d191c0c17..e7580bcd7 100644 --- a/gnu/java/rmi/server/ActivatableRef.java +++ b/gnu/java/rmi/server/ActivatableRef.java @@ -112,8 +112,10 @@ public class ActivatableRef extends UnicastRef 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 class ActivatableRef extends UnicastRef */ 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); } /** |