2003-07-13 Jeroen Frijters <jeroen@sumatra.nl>

       * java/beans/PropertyEditorManager.java (findEditor): use the thread
       context class loader to try and find the class

       * javax/naming/spi/NamingManager.java (getInitialContext): use the
       thread context class loader

1 files changed, 7 insertions, 3 deletions

diff --git a/javax/naming/spi/NamingManager.java b/javax/naming/spi/NamingManager.java
index 6d02f9d2c..8b215cee5 100644
--- a/javax/naming/spi/NamingManager.java
+++ b/javax/naming/spi/NamingManager.java
@@ -83,13 +83,17 @@ public class NamingManager
 
 	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)
 	  {
 	    NoInitialContextException e
-	      = new NoInitialContextException ("Can't load InitialContextFactory class: "
-					       + java_naming_factory_initial);
+	      = new NoInitialContextException
+	      ("Can't load InitialContextFactory class: "
+	       + java_naming_factory_initial);
 	    e.setRootCause(exception);
 	    throw e;
 	  }