diff options
Diffstat (limited to 'libjava/javax/naming')
| -rw-r--r-- | libjava/javax/naming/CompoundName.java | 8 | ||||
| -rw-r--r-- | libjava/javax/naming/spi/NamingManager.java | 10 |
2 files changed, 13 insertions, 5 deletions
diff --git a/libjava/javax/naming/CompoundName.java b/libjava/javax/naming/CompoundName.java index 20b6cc5..2039639 100644 --- a/libjava/javax/naming/CompoundName.java +++ b/libjava/javax/naming/CompoundName.java @@ -142,13 +142,17 @@ public class CompoundName implements Name, Cloneable, Serializable // 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 (); diff --git a/libjava/javax/naming/spi/NamingManager.java b/libjava/javax/naming/spi/NamingManager.java index 6d02f9d..8b215ce 100644 --- a/libjava/javax/naming/spi/NamingManager.java +++ b/libjava/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; } |