Merge Orp RMI patches from Wu Gansha <gansha.wu@intel.com>

        * configure.in (AC_OUTPUT): Add javax/rmi/Makefile,
        * gnu/javax/Makefile, gnu/javax/rmi/Makefile,
        javax/rmi/CORBA/Makefile and gnu/javax/rmi/CORBA/Makefile.
        * javax/.cvsignore: New File.
        * javax/Makefile.am (SUBDIRS): Add rmi.
        * javax/rmi/.cvsignore: New File.
        * javax/rmi/Makefile.am: New file.
        * javax/rmi/CORBA/.cvsignore: New file.
        * javax/rmi/CORBA/Makefile.am: New file.
        * gnu/Makefile.am (SUBDIRS): Add javax.
        * gnu/javax/.cvsignore: New file.
        * gnu/javax/Makefile.am: New file.
        * gnu/javax/rmi/.cvsignore: New file.
        * gnu/javax/rmi/Makefile.am: New file.
        * gnu/javax/rmi/CORBA/.cvsignore: New file.
        * gnu/javax/rmi/CORBA/Makefile.am: New file.

        * java/rmi/MarshalledObject.java (equals): Check hashcode first.

        * java/rmi/server/RMIClassLoader.java (MyClassLoader): Create/Use
        annotation.
        (loadClass): Take String as codebases.
        (getClassAnnotation): Use MyClassLoader annotations.
        * java/rmi/server/UnicastRemoteObject.java (UnicastRemoteObject):
        call exportObject(this).

        * gnu/java/rmi/RMIMarshalledObjectOutputStream.java
        (RMIMarshalledObjectOutputStream): set locBytesStream and locStream.
        (setAnnotation): Don't set locBytesStream and locStream.
        (replaceObject): Removed.
        (flush): Don't test locStream.
        (getLocButes): LikeWise.
        * gnu/java/rmi/dgc/DGCImpl.java: extends UnicastServerRef.
        (leaseCache): New field.
        (dirty): Use leaseCache.
        (LeaseRecord): New inner class.
        * gnu/java/rmi/registry/RegistryImpl.java (RegistryImpl): Don't
        explicitly call exportObject().
        * gnu/java/rmi/registry/RegistryImpl_Stub.java: set useNewInvoke to
        false to communicate with Sun JDK130.
        * gnu/java/rmi/server/ConnectionRunnerPool.java: Add CPU comment.
        * gnu/java/rmi/server/RMIObjectInputStream.java
        (UnicastConnectionManager): Removed field.
        * gnu/java/rmi/server/RMIObjectOutputStream.java (replaceObject):
        Use UnicastServer.getExportedRef().
        * gnu/java/rmi/server/UnicastConnection.java (reviveTime): New field.
        (expireTime): Likewise.
        (CONNECTION_TIMEOUT): Likewise.
        (disconnect): Call sock.close().
        (isExpired): New method.
        (resetTime): Likewise.
        (run): Use do while loop and catch Exception for discardConnection().
        * gnu/java/rmi/server/UnicastConnectionManager.java: Pool connections.
        * gnu/java/rmi/server/UnicastRef.java: Lots of changes.
        * gnu/java/rmi/server/UnicastRemoteCall.java: Lots of changes.
        * gnu/java/rmi/server/UnicastServer.java (refcache): New field.
        (exportObject): Use refcache.
        (unexportObject): Likewise.
        (getExportedRef): New method.
        * gnu/java/rmi/server/UnicastServerRef.java (UnicastServerRef): New
        constructor.
        (exportObject): Save manager.serverobj.
        (getStub): New method.

        * javax/rmi/PortableRemoteObject.java: New file.
        * gnu/javax/rmi/PortableServer.java: Likewise.

        * javax/rmi/CORBA/ClassDesc.java: New file.
        * javax/rmi/CORBA/PortableRemoteObjectDelegate.java: Likewise.
        * javax/rmi/CORBA/Stub.java: Likewise.
        * javax/rmi/CORBA/StubDelegate.java: Likewise.
        * javax/rmi/CORBA/Tie.java: Likewise.
        * javax/rmi/CORBA/Util.java: Likewise.
        * javax/rmi/CORBA/UtilDelegate.java: Likewise.
        * javax/rmi/CORBA/ValueHandler.java: Likewise.
        * gnu/javax/rmi/CORBA/DelegateFactory.java: Likewise.
        * gnu/javax/rmi/CORBA/GetDelegateInstanceException.java: Likewise.
        * gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.java: Likewise.
        * gnu/javax/rmi/CORBA/StubDelegateImpl.java: Likewise.
        * gnu/javax/rmi/CORBA/UtilDelegateImpl.java: Likewise.
        * gnu/javax/rmi/CORBA/ValueHandlerImpl.java: Likewise.

        * javax/rmi/BAD_OPERATION.java: Stub class.
        * javax/rmi/ORB.java: Likewise
        * javax/rmi/CORBA/ObjectImpl.java: Likewise
        * javax/rmi/CORBA/SystemException.java: Likewise.

1 files changed, 11 insertions, 22 deletions

diff --git a/gnu/java/rmi/server/RMIObjectInputStream.java b/gnu/java/rmi/server/RMIObjectInputStream.java
index 5913e9221..3e862c3c1 100644
--- a/gnu/java/rmi/server/RMIObjectInputStream.java
+++ b/gnu/java/rmi/server/RMIObjectInputStream.java
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+  Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -50,23 +50,13 @@ import java.lang.reflect.Proxy;
 public class RMIObjectInputStream
 	extends ObjectInputStream {
 
-UnicastConnectionManager manager;
-
-public RMIObjectInputStream(InputStream strm, UnicastConnectionManager man) throws IOException {
+public RMIObjectInputStream(InputStream strm) throws IOException {
 	super(strm);
-	manager = man;
 	enableResolveObject(true);
 }
 
-public RMIObjectInputStream(InputStream strm) throws IOException {
-	this(strm, UnicastConnectionManager.getInstance(0, null));
-}
-
 protected Class resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {
 	String annotation = (String)getAnnotation();
-	try{
-		return super.resolveClass(desc);
-	}catch(ClassNotFoundException _){};
 	
 	try {
 		if(annotation == null)
@@ -90,24 +80,23 @@ protected Class resolveProxyClass(String intfs[])
         throws IOException, ClassNotFoundException
 {
     String annotation = (String)getAnnotation();
-    try{
-		return super.resolveProxyClass(intfs);
-	}catch(ClassNotFoundException _){};
 	
     Class clss[] = new Class[intfs.length];
     if(annotation == null)
         clss[0] = RMIClassLoader.loadClass(intfs[0]);
     else
         clss[0] = RMIClassLoader.loadClass(annotation, intfs[0]);
+    
     //assume all interfaces can be loaded by the same classloader
     ClassLoader loader = clss[0].getClassLoader();
-    if(loader == null)
-        for(int i = 1; i < intfs.length; i++)
-            clss[i] = Class.forName(intfs[i]);    
-    else
-        for(int i = 1; i < intfs.length; i++)
-            clss[i] = loader.loadClass(intfs[i]);    
+    for (int i = 0; i < intfs.length; i++)
+        clss[i] = Class.forName(intfs[i], false, loader);
+        
+    try {
     return Proxy.getProxyClass(loader, clss);
+	} catch (IllegalArgumentException e) {
+	    throw new ClassNotFoundException(null, e);
+	}  
 }
 
 protected Object readValue(Class valueClass) throws IOException, ClassNotFoundException {
@@ -134,4 +123,4 @@ protected Object readValue(Class valueClass) throws IOException, ClassNotFoundEx
         return readObject();
 }
 
-}
\ No newline at end of file
+}