diff options
| author | Dalibor Topic <robilad@kaffe.org> | 2003-09-18 19:51:39 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2003-09-18 19:51:39 +0000 |
| commit | 1eeae5c1cd181f088021ade241b3ad956d8cd650 (patch) | |
| tree | 1ffd7581309254d80ec2aff3141702e2af17acef | |
| parent | 8d8369f85bd2552ed29dbc083c9b5f9e9566008f (diff) | |
| download | gcc-1eeae5c1cd181f088021ade241b3ad956d8cd650.zip gcc-1eeae5c1cd181f088021ade241b3ad956d8cd650.tar.gz gcc-1eeae5c1cd181f088021ade241b3ad956d8cd650.tar.bz2 | |
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
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/javax/naming/spi/NamingManager.java | 16 |
2 files changed, 19 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index fbe4072..0872771 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +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> * java/util/Timer.java (finalize): Added "throws Throwable". diff --git a/libjava/javax/naming/spi/NamingManager.java b/libjava/javax/naming/spi/NamingManager.java index 8b215ce..65ce2d2 100644 --- a/libjava/javax/naming/spi/NamingManager.java +++ b/libjava/javax/naming/spi/NamingManager.java @@ -129,7 +129,9 @@ public class NamingManager String aTry = tokens.nextToken (); try { - Class factoryClass = Class.forName (aTry + "." + scheme); + Class factoryClass = Class.forName (aTry + "." + scheme, + true, + Thread.currentThread().getContextClassLoader()); ObjectFactory factory = (ObjectFactory) factoryClass.newInstance (); Object obj = factory.getObjectInstance (refInfo, name, @@ -231,7 +233,9 @@ public class NamingManager if (fClass != null) { // 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 (); } else @@ -275,7 +279,9 @@ public class NamingManager while (tokens.hasMoreTokens ()) { String klassName = tokens.nextToken (); - Class k = Class.forName (klassName); + Class k = Class.forName (klassName, + true, + Thread.currentThread().getContextClassLoader()); factory = (ObjectFactory) k.newInstance (); Object obj = factory.getObjectInstance (refInfo, name, nameCtx, environment); @@ -341,7 +347,9 @@ public class NamingManager String klassName = tokens.nextToken (); try { - Class k = Class.forName (klassName); + Class k = Class.forName (klassName, + true, + Thread.currentThread().getContextClassLoader()); StateFactory factory = (StateFactory) k.newInstance (); Object o = factory.getStateToBind (obj, name, nameCtx, environment); |