From: Tom Tromey <tromey@redhat.com>
Date: Sun, 12 Sep 2004 23:16:38 +0000 (+0000)
Subject: CompoundName.java (CompoundName): Don't check for separator in "flat" case.
X-Git-Tag: releases/gcc-4.0.0~4995
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3abcc195e419c0697bf9854eae8c2a2986626c44;p=thirdparty%2Fgcc.git

CompoundName.java (CompoundName): Don't check for separator in "flat" case.

	* javax/naming/CompoundName.java (CompoundName): Don't check for
	separator in "flat" case.

From-SVN: r87410
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 84ce784d5d20..39a17af3b503 100644
--- 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 4908d1bed6dd..17f2aab7ea73 100644
--- 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);