diff options
| author | Michael Koch <konqueror@gmx.de> | 2003-07-14 05:33:30 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2003-07-14 05:33:30 +0000 |
| commit | 6a71677713a891ed583f065f21e40e3d4d89562c (patch) | |
| tree | 325c55b07a6af031947ba6f55a84fc7897bf374b /libjava/javax/naming | |
| parent | 6e98504002b3ee32c9b3d17da648b01e1424f833 (diff) | |
| download | gcc-6a71677713a891ed583f065f21e40e3d4d89562c.zip gcc-6a71677713a891ed583f065f21e40e3d4d89562c.tar.gz gcc-6a71677713a891ed583f065f21e40e3d4d89562c.tar.bz2 | |
MemoryImageSource.java, [...]: New versions from classpath.
2003-07-14 Michael Koch <konqueror@gmx.de>
* java/awt/image/MemoryImageSource.java,
java/beans/PropertyEditorManager.java,
javax/naming/CompoundName.java,
javax/naming/spi/NamingManager.java,
javax/swing/AbstractButton.java,
javax/swing/ButtonModel.java,
javax/swing/SwingUtilities.java,
javax/swing/UIManager.java,
javax/swing/colorchooser/DefaultColorSelectionModel.java,
javax/swing/event/AncestorEvent.java,
javax/swing/event/InternalFrameEvent.java,
java/util/zip/ZipFile.java:
New versions from classpath.
From-SVN: r69321
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; } |