* javax/naming/CompoundName.java (CompoundName): Don't check for

	separator in "flat" case.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@87410 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 84ce784..39a17af 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/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-12  Michael Koch  <konqueror@gmx.de>
 
        * libltdl/configure.ac: Fixed AM_INIT_AUTOMAKE usage and replaces

diff --git a/libjava/javax/naming/CompoundName.java b/libjava/javax/naming/CompoundName.java
index 4908d1b..17f2aab 100644 (file)
--- a/libjava/javax/naming/CompoundName.java
+++ b/libjava/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);