Index: gnu/java/rmi/server/UnicastServerRef.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/rmi/server/UnicastServerRef.java,v
retrieving revision 1.5
diff -u -r1.5 UnicastServerRef.java
--- gnu/java/rmi/server/UnicastServerRef.java	3 Jan 2003 22:55:06 -0000	1.5
+++ gnu/java/rmi/server/UnicastServerRef.java	10 Jun 2003 14:46:25 -0000
@@ -139,7 +139,7 @@
 	try {   
 	    String classname = cls.getName();
 		ClassLoader cl = cls.getClassLoader(); //DONT use "Class scls = Class.forName(classname + type);"
-		Class scls = cl.loadClass(classname + type);
+		Class scls = cl == null ? Class.forName(classname + type) : cl.loadClass(classname + type);
 		if (type.equals("_Stub")) {
 			try {
 				// JDK 1.2 stubs
Index: java/beans/PropertyEditorManager.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/beans/PropertyEditorManager.java,v
retrieving revision 1.7
diff -u -r1.7 PropertyEditorManager.java
--- java/beans/PropertyEditorManager.java	17 Mar 2003 16:28:50 -0000	1.7
+++ java/beans/PropertyEditorManager.java	10 Jun 2003 14:46:31 -0000
@@ -140,9 +140,11 @@
             return (PropertyEditor)found.newInstance();
           }
 
+	ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+
         try
           {
-            found = Class.forName(editedClass.getName()+"Editor");
+            found = Class.forName(editedClass.getName()+"Editor", true, contextClassLoader);
             registerEditor(editedClass,found);
             return (PropertyEditor)found.newInstance();
           }
@@ -157,7 +159,7 @@
               {
                 try
                   {
-                    found = Class.forName(editorSearchPath[i] + appendName);
+                    found = Class.forName(editorSearchPath[i] + appendName, true, contextClassLoader);
                     registerEditor(editedClass,found);
                     return (PropertyEditor)found.newInstance();
                   }
Index: javax/naming/CompoundName.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/CompoundName.java,v
retrieving revision 1.1
diff -u -r1.1 CompoundName.java
--- javax/naming/CompoundName.java	23 Nov 2002 21:44:28 -0000	1.1
+++ javax/naming/CompoundName.java	10 Jun 2003 14:46:35 -0000
@@ -140,13 +140,13 @@
 	    // Otherwise, fall through.
 	  }
 	// Quotes are only special at the start of a component.
-	else if (new_element.length () == 0 && special == beginQuote)
+	else if (new_element.length () == 0 && special == beginQuote && beginQuote != null)
 	  {
 	    quote = endQuote;
 	    i += special.length ();
 	    continue;
 	  }
-	else if (new_element.length () == 0 && special == beginQuote2)
+	else if (new_element.length () == 0 && special == beginQuote2 && beginQuote2 != null)
 	  {
 	    quote = endQuote2;
 	    i += special.length ();
Index: javax/naming/spi/NamingManager.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/spi/NamingManager.java,v
retrieving revision 1.1
diff -u -r1.1 NamingManager.java
--- javax/naming/spi/NamingManager.java	23 Nov 2002 21:44:28 -0000	1.1
+++ javax/naming/spi/NamingManager.java	10 Jun 2003 14:46:36 -0000
@@ -83,7 +83,7 @@
 
 	try
 	  {
-	    icf = (InitialContextFactory) Class.forName (java_naming_factory_initial).newInstance ();
+	    icf = (InitialContextFactory) Class.forName (java_naming_factory_initial, true, Thread.currentThread().getContextClassLoader()).newInstance ();
 	  }
 	catch (Exception exception)
 	  {