summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--javax/naming/CompoundName.java4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d9d1ee6e..5888568ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-12 Tom Tromey <tromey@redhat.com>
+
+ * javax/naming/CompoundName.java (CompoundName): Don't check for
+ separator in "flat" case.
+
2004-09-11 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/awt/MenuComponent.java
diff --git a/javax/naming/CompoundName.java b/javax/naming/CompoundName.java
index 4908d1bed..17f2aab7e 100644
--- a/javax/naming/CompoundName.java
+++ b/javax/naming/CompoundName.java
@@ -55,6 +55,8 @@ import java.util.Vector;
* direction is never described. If it means that the CompoundName
* can only have a single element, then the Enumeration-based
* constructor ought to throw InvalidNameException.
+ *
+ * @since 1.3
*/
public class CompoundName implements Name, Cloneable, Serializable
{
@@ -158,7 +160,7 @@ public class CompoundName implements Name, Cloneable, Serializable
i += special.length ();
continue;
}
- else if (special == separator)
+ else if (direction != FLAT && special == separator)
{
elts.add (new_element.toString ());
new_element.setLength (0);