Commit 1eeae5c1 by Dalibor Topic Committed by Tom Tromey

NamingManager.java (getURLContext, [...]): Always use current thread's context…

NamingManager.java (getURLContext, [...]): Always use current thread's context class loader when calling Class.forName.

2003-09-18  Dalibor Topic <robilad@kaffe.org>,
	    Helmer Kraemer <hkraemer@freenet.de>

	* javax/naming/spi/NamingManager.java (getURLContext,
	getObjectInstance, getStateToBind): Always use current thread's
	context class loader when calling Class.forName.

Co-Authored-By: Helmer Kraemer <hkraemer@freenet.de>

From-SVN: r71534
parent 8d8369f8
2003-09-18 Dalibor Topic <robilad@kaffe.org>,
Helmer Kraemer <hkraemer@freenet.de>
* javax/naming/spi/NamingManager.java (getURLContext,
getObjectInstance, getStateToBind): Always use current thread's
context class loader when calling Class.forName.
2003-09-18 Michael Koch <konqueror@gmx.de> 2003-09-18 Michael Koch <konqueror@gmx.de>
* java/util/Timer.java (finalize): Added "throws Throwable". * java/util/Timer.java (finalize): Added "throws Throwable".
......
...@@ -129,7 +129,9 @@ public class NamingManager ...@@ -129,7 +129,9 @@ public class NamingManager
String aTry = tokens.nextToken (); String aTry = tokens.nextToken ();
try try
{ {
Class factoryClass = Class.forName (aTry + "." + scheme); Class factoryClass = Class.forName (aTry + "." + scheme,
true,
Thread.currentThread().getContextClassLoader());
ObjectFactory factory = ObjectFactory factory =
(ObjectFactory) factoryClass.newInstance (); (ObjectFactory) factoryClass.newInstance ();
Object obj = factory.getObjectInstance (refInfo, name, Object obj = factory.getObjectInstance (refInfo, name,
...@@ -231,7 +233,9 @@ public class NamingManager ...@@ -231,7 +233,9 @@ public class NamingManager
if (fClass != null) if (fClass != null)
{ {
// Exceptions here are passed to the caller. // Exceptions here are passed to the caller.
Class k = Class.forName (fClass); Class k = Class.forName (fClass,
true,
Thread.currentThread().getContextClassLoader());
factory = (ObjectFactory) k.newInstance (); factory = (ObjectFactory) k.newInstance ();
} }
else else
...@@ -275,7 +279,9 @@ public class NamingManager ...@@ -275,7 +279,9 @@ public class NamingManager
while (tokens.hasMoreTokens ()) while (tokens.hasMoreTokens ())
{ {
String klassName = tokens.nextToken (); String klassName = tokens.nextToken ();
Class k = Class.forName (klassName); Class k = Class.forName (klassName,
true,
Thread.currentThread().getContextClassLoader());
factory = (ObjectFactory) k.newInstance (); factory = (ObjectFactory) k.newInstance ();
Object obj = factory.getObjectInstance (refInfo, name, Object obj = factory.getObjectInstance (refInfo, name,
nameCtx, environment); nameCtx, environment);
...@@ -341,7 +347,9 @@ public class NamingManager ...@@ -341,7 +347,9 @@ public class NamingManager
String klassName = tokens.nextToken (); String klassName = tokens.nextToken ();
try try
{ {
Class k = Class.forName (klassName); Class k = Class.forName (klassName,
true,
Thread.currentThread().getContextClassLoader());
StateFactory factory = (StateFactory) k.newInstance (); StateFactory factory = (StateFactory) k.newInstance ();
Object o = factory.getStateToBind (obj, name, nameCtx, Object o = factory.getStateToBind (obj, name, nameCtx,
environment); environment);
......
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