FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged gcj-eclipse branch to trunk.

Browse source 
From-SVN: r120621
This commit is contained in:
Tom Tromey 2007-01-09 19:58:05 +00:00
parent c648dedbde
commit 97b8365caf
17478 changed files with 606493 additions and 100744 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libjava/classpath/gnu/java/rmi/server/ActivatableRef.java
View file

@ -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);
}
/**