svn commit: r476135 - in /incubator/yoko/trunk/rmi-spec/src/main/java/javax/rmi: CORBA/Stub.java PortableRemoteObject.java

[ri...@apache.org]

Author: rickmcguire
Date: Fri Nov 17 05:31:03 2006
New Revision: 476135

URL: http://svn.apache.org/viewvc?view=rev&rev=476135
Log:
YOKO-213 PortableRemoteObject instances are not exporting themselves when created.
YOKO-214 Serialization errors with Stub class


Modified:
    incubator/yoko/trunk/rmi-spec/src/main/java/javax/rmi/CORBA/Stub.java
    incubator/yoko/trunk/rmi-spec/src/main/java/javax/rmi/PortableRemoteObject.java

Modified: incubator/yoko/trunk/rmi-spec/src/main/java/javax/rmi/CORBA/Stub.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/rmi-spec/src/main/java/javax/rmi/CORBA/Stub.java?view=diff&rev=476135&r1=476134&r2=476135
==============================================================================
--- incubator/yoko/trunk/rmi-spec/src/main/java/javax/rmi/CORBA/Stub.java (original)
+++ incubator/yoko/trunk/rmi-spec/src/main/java/javax/rmi/CORBA/Stub.java Fri Nov 17 05:31:03 2006
@@ -16,16 +16,21 @@
 
 package javax.rmi.CORBA;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.rmi.RemoteException;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA_2_3.portable.ObjectImpl;
-
 import java.security.AccessController;
+
 import org.apache.yoko.rmispec.util.GetSystemPropertyAction;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA_2_3.portable.ObjectImpl;
 
 public abstract class Stub extends ObjectImpl implements Serializable {
-    private StubDelegate delegate = null;
+    static final long serialVersionUID = 1087775603798577179L;
+
+    private transient StubDelegate delegate = null;
     private final String defaultDelegate = "org.apache.yoko.rmi.impl.StubImpl";
 
     public Stub() {
@@ -54,5 +59,13 @@
 
     public String toString() {
         return delegate.toString(this);
+    }
+
+    public void readObject(Stub self, ObjectInputStream ois) throws IOException, ClassNotFoundException {
+        delegate.readObject(self, ois);
+    }
+
+    public void writeObject(Stub self, ObjectOutputStream oos) throws IOException {
+        delegate.writeObject(self, oos);
     }
 }

Modified: incubator/yoko/trunk/rmi-spec/src/main/java/javax/rmi/PortableRemoteObject.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/rmi-spec/src/main/java/javax/rmi/PortableRemoteObject.java?view=diff&rev=476135&r1=476134&r2=476135
==============================================================================
--- incubator/yoko/trunk/rmi-spec/src/main/java/javax/rmi/PortableRemoteObject.java (original)
+++ incubator/yoko/trunk/rmi-spec/src/main/java/javax/rmi/PortableRemoteObject.java Fri Nov 17 05:31:03 2006
@@ -41,7 +41,7 @@
 
     protected PortableRemoteObject() throws RemoteException {
         // Register object
-        //exportObject(this);
+        exportObject((Remote)this);
     }
 
     public static void connect(Remote target, Remote source) throws RemoteException {