Commit 3a009999 by Michael Koch Committed by Michael Koch

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
parent 6a716777
2003-07-14 Michael Koch <konqueror@gmx.de> 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, * java/awt/image/MemoryImageSource.java,
java/beans/PropertyEditorManager.java, java/beans/PropertyEditorManager.java,
javax/naming/CompoundName.java, javax/naming/CompoundName.java,
......
...@@ -138,8 +138,9 @@ public boolean unexportObject(Remote obj, boolean force) { ...@@ -138,8 +138,9 @@ public boolean unexportObject(Remote obj, boolean force) {
private Object getHelperClass(Class cls, String type) { private Object getHelperClass(Class cls, String type) {
try { try {
String classname = cls.getName(); String classname = cls.getName();
ClassLoader cl = cls.getClassLoader(); //DONT use "Class scls = Class.forName(classname + type);" ClassLoader cl = cls.getClassLoader();
Class scls = cl.loadClass(classname + type); Class scls = cl == null ? Class.forName(classname + type)
: cl.loadClass(classname + type);
if (type.equals("_Stub")) { if (type.equals("_Stub")) {
try { try {
// JDK 1.2 stubs // JDK 1.2 stubs
...@@ -225,7 +226,9 @@ public Object incomingMessageCall(UnicastConnection conn, int method, long hash) ...@@ -225,7 +226,9 @@ public Object incomingMessageCall(UnicastConnection conn, int method, long hash)
* lets us know that. * lets us know that.
*/ */
try { try {
args[i] = in.readObject(); // need to handle primitive types
args[i] = ((RMIObjectInputStream)in).readValue(meth.getParameterTypes()[i]);
} }
catch (Exception t) { catch (Exception t) {
t.printStackTrace(); t.printStackTrace();
...@@ -257,3 +260,5 @@ public Object incomingMessageCall(UnicastConnection conn, int method, long hash) ...@@ -257,3 +260,5 @@ public Object incomingMessageCall(UnicastConnection conn, int method, long hash)
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment