aboutsummaryrefslogtreecommitdiff
path: root/libjava/javax/naming/CompoundName.java
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2003-07-14 05:33:30 +0000
committerMichael Koch <mkoch@gcc.gnu.org>2003-07-14 05:33:30 +0000
commit6a71677713a891ed583f065f21e40e3d4d89562c (patch)
tree325c55b07a6af031947ba6f55a84fc7897bf374b /libjava/javax/naming/CompoundName.java
parent6e98504002b3ee32c9b3d17da648b01e1424f833 (diff)
downloadgcc-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/CompoundName.java')
-rw-r--r--libjava/javax/naming/CompoundName.java8
1 files changed, 6 insertions, 2 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 ();