PatchSet 5169 
Date: 2004/09/14 22:09:30
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: CompoundName fix

2004-09-14  Dalibor Topic  <[EMAIL PROTECTED]>

        * libraries/javalib/javax/naming/CompoundName.java:
        Resynced with GNU Classpath.

        2004-09-12  Tom Tromey  <[EMAIL PROTECTED]>

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

Members: 
        ChangeLog:1.2724->1.2725 
        libraries/javalib/javax/naming/CompoundName.java:1.6->1.7 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2724 kaffe/ChangeLog:1.2725
--- kaffe/ChangeLog:1.2724      Tue Sep 14 20:17:27 2004
+++ kaffe/ChangeLog     Tue Sep 14 22:09:30 2004
@@ -1,5 +1,15 @@
 2004-09-14  Dalibor Topic  <[EMAIL PROTECTED]>
 
+       * libraries/javalib/javax/naming/CompoundName.java:
+       Resynced with GNU Classpath.
+
+       2004-09-12  Tom Tromey  <[EMAIL PROTECTED]>
+
+        * javax/naming/CompoundName.java (CompoundName): Don't check for
+        separator in "flat" case.
+
+2004-09-14  Dalibor Topic  <[EMAIL PROTECTED]>
+
        * libraries/javalib/Makefile.am.in
        Only build gmp math when native libs are 
        built, too.
Index: kaffe/libraries/javalib/javax/naming/CompoundName.java
diff -u kaffe/libraries/javalib/javax/naming/CompoundName.java:1.6 
kaffe/libraries/javalib/javax/naming/CompoundName.java:1.7
--- kaffe/libraries/javalib/javax/naming/CompoundName.java:1.6  Sat May  1 16:30:25 
2004
+++ kaffe/libraries/javalib/javax/naming/CompoundName.java      Tue Sep 14 22:09:32 
2004
@@ -55,6 +55,8 @@
  * 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 @@
            i += special.length ();
            continue;
          }
-       else if (special == separator)
+       else if (direction != FLAT && special == separator)
          {
            elts.add (new_element.toString ());
            new_element.setLength (0);

_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

Reply via email to