bug 540

2 files changed, 61 insertions, 2 deletions

diff --git a/java/src/IceInternal/RouterInfo.java b/java/src/IceInternal/RouterInfo.java
index a83ccbc78f8..7a07f054e38 100644
--- a/java/src/IceInternal/RouterInfo.java
+++ b/java/src/IceInternal/RouterInfo.java
@@ -14,7 +14,7 @@ public final class RouterInfo
     RouterInfo(Ice.RouterPrx router)
     {
         _router = router;
-        _routingTable = new Ice.RoutingTable();
+        _routingTable = new RoutingTable();
 
         assert(_router != null);
     }
@@ -141,6 +141,6 @@ public final class RouterInfo
     private final Ice.RouterPrx _router;
     private Ice.ObjectPrx _clientProxy;
     private Ice.ObjectPrx _serverProxy;
-    private final Ice.RoutingTable _routingTable;
+    private final RoutingTable _routingTable;
     private Ice.ObjectAdapter _adapter;
 }
diff --git a/java/src/IceInternal/RoutingTable.java b/java/src/IceInternal/RoutingTable.java
new file mode 100644
index 00000000000..647c4f7f852
--- /dev/null
+++ b/java/src/IceInternal/RoutingTable.java
@@ -0,0 +1,59 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+package IceInternal;
+
+public final class RoutingTable
+{
+    public
+    RoutingTable()
+    {
+    }
+
+    //
+    // Clear the contents of the routing table.
+    //
+    synchronized public void
+    clear()
+    {
+	_table.clear();
+    }
+
+    //
+    // Returns false if the Proxy exists already.
+    //
+    public boolean
+    add(Ice.ObjectPrx prx)
+    {
+        if(prx == null)
+        {
+            return false;
+        }
+
+	//
+	// We insert the proxy in its default form into the routing table.
+	//
+        Ice.ObjectPrx proxy = prx.ice_twoway().ice_secure(false);
+
+        synchronized(this)
+        {
+            if(!_table.containsKey(proxy.ice_getIdentity()))
+            {
+                _table.put(proxy.ice_getIdentity(), proxy);
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+    }
+
+    private java.util.HashMap _table = new java.util.HashMap();
+}