Imported GNU Classpath 0.90

       Imported GNU Classpath 0.90
       * scripts/makemake.tcl: Set gnu/java/awt/peer/swing to ignore.
       * gnu/classpath/jdwp/VMFrame.java (SIZE): New constant.
       * java/lang/VMCompiler.java: Use gnu.java.security.hash.MD5.
       * java/lang/Math.java: New override file.
       * java/lang/Character.java: Merged from Classpath.
       (start, end): Now 'int's.
       (canonicalName): New field.
       (CANONICAL_NAME, NO_SPACES_NAME, CONSTANT_NAME): New constants.
       (UnicodeBlock): Added argument.
       (of): New overload.
       (forName): New method.
       Updated unicode blocks.
       (sets): Updated.
       * sources.am: Regenerated.
       * Makefile.in: Likewise.

From-SVN: r111942

1 files changed, 8 insertions, 5 deletions

diff --git a/libjava/classpath/gnu/CORBA/NamingService/NamingMap.java b/libjava/classpath/gnu/CORBA/NamingService/NamingMap.java
index 95deb0096bd..f4e940ea907 100644
--- a/libjava/classpath/gnu/CORBA/NamingService/NamingMap.java
+++ b/libjava/classpath/gnu/CORBA/NamingService/NamingMap.java
@@ -58,11 +58,11 @@ public class NamingMap
   /**
    * The actual map.
    */
-  private final TreeMap map;
+  protected final TreeMap map;
 
   /**
    * Creates an instance of the naming map, intialising the comparator
-   * to the {@link cmpNameComparator}.
+   * to the {@link NameComponentComparator}.
    */
   public NamingMap()
   {
@@ -70,7 +70,7 @@ public class NamingMap
   }
 
   /**
-   * Put the given CORBA object, specifying the given name as a key.
+   * Put the given GIOP object, specifying the given name as a key.
    * If the entry with the given name already exists, or if the given
    * object is already mapped under another name, the
    * {@link AlreadyBound} exception will be thrown.
@@ -93,8 +93,11 @@ public class NamingMap
     else
       {
         if (containsValue(object))
-          throw new AlreadyBound("Tha object has another name");
+          throw new AlreadyBound("The object has another name");
       }
+    
+    // There are no restrictions in binding the object.
+    rebind(name, object);
   }
 
   /**
@@ -141,7 +144,7 @@ public class NamingMap
   }
 
   /**
-   * Put the given CORBA object, specifying the given name as a key.
+   * Put the given GIOP object, specifying the given name as a key.
    * Remove all pre - existing mappings for the given name and object.
    *
    * @param name the name.