UnicastServerRef.java: New version from classpath.

2003-07-14  Michael Koch  <konqueror@gmx.de>

	* gnu/java/rmi/server/UnicastServerRef.java:
	New version from classpath.

From-SVN: r69322

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index cc46804b0c0edcd2531978492d2529a667de1c6c..baa5810f3e756a32b4377ae77e9c20cca3246ab2 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-14  Michael Koch  <konqueror@gmx.de>
+
+       * gnu/java/rmi/server/UnicastServerRef.java:
+       New version from classpath.
+
 2003-07-14  Michael Koch  <konqueror@gmx.de>
 
        * java/awt/image/MemoryImageSource.java,

diff --git a/libjava/gnu/java/rmi/server/UnicastServerRef.java b/libjava/gnu/java/rmi/server/UnicastServerRef.java
index a3a999f2e9f0f77f7c989e078616602b61b0ddbd..e2f38ff5f8c5235a6789adeb4394cb3dd8201422 100644 (file)
--- a/libjava/gnu/java/rmi/server/UnicastServerRef.java
+++ b/libjava/gnu/java/rmi/server/UnicastServerRef.java
@@ -138,8 +138,9 @@ public boolean unexportObject(Remote obj, boolean force) {
 private Object getHelperClass(Class cls, String type) {
        try {   
            String classname = cls.getName();
-               ClassLoader cl = cls.getClassLoader(); //DONT use "Class scls = Class.forName(classname + type);"
-               Class scls = cl.loadClass(classname + type);
+               ClassLoader cl = cls.getClassLoader();
+               Class scls = cl == null ? Class.forName(classname + type)
+                                       : cl.loadClass(classname + type);
                if (type.equals("_Stub")) {
                        try {
                                // JDK 1.2 stubs
@@ -225,7 +226,9 @@ public Object incomingMessageCall(UnicastConnection conn, int method, long hash)
                         * lets us know that.
                         */
                        try {
-                               args[i] = in.readObject();
+                               // need to handle primitive types
+                               args[i] = ((RMIObjectInputStream)in).readValue(meth.getParameterTypes()[i]);
+                               
                        }
                        catch (Exception t) {
                                t.printStackTrace();
@@ -257,3 +260,5 @@ public Object incomingMessageCall(UnicastConnection conn, int method, long hash)
 }
 
 }
+
+