1 files changed, 76 insertions, 63 deletions

diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java
index 16c9e769db9..a03e8143ec7 100644
--- a/java/src/Ice/ObjectPrxHelperBase.java
+++ b/java/src/Ice/ObjectPrxHelperBase.java
@@ -411,32 +411,38 @@ public class ObjectPrxHelperBase implements ObjectPrx
         }
     }
 
+    public final boolean
+    ice_getSecure()
+    {
+	return _reference.getSecure();
+    }
+
     public final ObjectPrx
-    ice_twoway()
+    ice_secure(boolean b)
     {
-        IceInternal.Reference ref = _reference.changeMode(IceInternal.Reference.ModeTwoway);
-        if(ref.equals(_reference))
+        if(b == _reference.getSecure())
         {
             return this;
         }
         else
         {
             ObjectPrxHelperBase proxy = new ObjectPrxHelperBase();
-            proxy.setup(ref);
+            proxy.setup(_reference.changeSecure(b));
             return proxy;
         }
     }
 
-    public final boolean
-    ice_isTwoway()
+    public final Ice.RouterPrx
+    ice_getRouter()
     {
-	return _reference.getMode() == IceInternal.Reference.ModeTwoway;
+	IceInternal.RouterInfo ri = _reference.getRouterInfo();
+	return ri != null ? ri.getRouter() : null;
     }
 
     public final ObjectPrx
-    ice_oneway()
+    ice_router(Ice.RouterPrx router)
     {
-        IceInternal.Reference ref = _reference.changeMode(IceInternal.Reference.ModeOneway);
+        IceInternal.Reference ref = _reference.changeRouter(router);
         if(ref.equals(_reference))
         {
             return this;
@@ -449,16 +455,17 @@ public class ObjectPrxHelperBase implements ObjectPrx
         }
     }
 
-    public final boolean
-    ice_isOneway()
+    public final Ice.LocatorPrx
+    ice_getLocator()
     {
-	return _reference.getMode() == IceInternal.Reference.ModeOneway;
+	IceInternal.LocatorInfo ri = _reference.getLocatorInfo();
+	return ri != null ? ri.getLocator() : null;
     }
 
     public final ObjectPrx
-    ice_batchOneway()
+    ice_locator(Ice.LocatorPrx locator)
     {
-        IceInternal.Reference ref = _reference.changeMode(IceInternal.Reference.ModeBatchOneway);
+        IceInternal.Reference ref = _reference.changeLocator(locator);
         if(ref.equals(_reference))
         {
             return this;
@@ -472,123 +479,135 @@ public class ObjectPrxHelperBase implements ObjectPrx
     }
 
     public final boolean
-    ice_isBatchOneway()
+    ice_getCollocationOptimization()
     {
-	return _reference.getMode() == IceInternal.Reference.ModeBatchOneway;
+	return _reference.getCollocationOptimization();
     }
 
     public final ObjectPrx
-    ice_datagram()
+    ice_collocationOptimization(boolean b)
     {
-        IceInternal.Reference ref = _reference.changeMode(IceInternal.Reference.ModeDatagram);
-        if(ref.equals(_reference))
+        if(b == _reference.getCollocationOptimization())
         {
             return this;
         }
         else
         {
             ObjectPrxHelperBase proxy = new ObjectPrxHelperBase();
-            proxy.setup(ref);
+            proxy.setup(_reference.changeCollocationOptimization(b));
             return proxy;
         }
     }
 
-    public final boolean
-    ice_isDatagram()
-    {
-	return _reference.getMode() == IceInternal.Reference.ModeDatagram;
-    }
-
     public final ObjectPrx
-    ice_batchDatagram()
+    ice_twoway()
     {
-        IceInternal.Reference ref = _reference.changeMode(IceInternal.Reference.ModeBatchDatagram);
-        if(ref.equals(_reference))
+        if(_reference.getMode() == IceInternal.Reference.ModeTwoway)
         {
             return this;
         }
         else
         {
             ObjectPrxHelperBase proxy = new ObjectPrxHelperBase();
-            proxy.setup(ref);
+            proxy.setup(_reference.changeMode(IceInternal.Reference.ModeTwoway));
             return proxy;
         }
     }
 
     public final boolean
-    ice_isBatchDatagram()
+    ice_isTwoway()
     {
-	return _reference.getMode() == IceInternal.Reference.ModeBatchDatagram;
+	return _reference.getMode() == IceInternal.Reference.ModeTwoway;
     }
 
     public final ObjectPrx
-    ice_secure(boolean b)
+    ice_oneway()
     {
-        IceInternal.Reference ref = _reference.changeSecure(b);
-        if(ref.equals(_reference))
+        if(_reference.getMode() == IceInternal.Reference.ModeOneway)
         {
             return this;
         }
         else
         {
             ObjectPrxHelperBase proxy = new ObjectPrxHelperBase();
-            proxy.setup(ref);
+            proxy.setup(_reference.changeMode(IceInternal.Reference.ModeOneway));
             return proxy;
         }
     }
 
+    public final boolean
+    ice_isOneway()
+    {
+	return _reference.getMode() == IceInternal.Reference.ModeOneway;
+    }
+
     public final ObjectPrx
-    ice_compress(boolean co)
+    ice_batchOneway()
     {
-        IceInternal.Reference ref = _reference.changeCompress(co);
-        if(ref.equals(_reference))
+        if(_reference.getMode() == IceInternal.Reference.ModeBatchOneway)
         {
             return this;
         }
         else
         {
             ObjectPrxHelperBase proxy = new ObjectPrxHelperBase();
-            proxy.setup(ref);
+            proxy.setup(_reference.changeMode(IceInternal.Reference.ModeBatchOneway));
             return proxy;
         }
     }
 
+    public final boolean
+    ice_isBatchOneway()
+    {
+	return _reference.getMode() == IceInternal.Reference.ModeBatchOneway;
+    }
+
     public final ObjectPrx
-    ice_timeout(int t)
+    ice_datagram()
     {
-        IceInternal.Reference ref = _reference.changeTimeout(t);
-        if(ref.equals(_reference))
+        if(_reference.getMode() == IceInternal.Reference.ModeDatagram)
         {
             return this;
         }
         else
         {
             ObjectPrxHelperBase proxy = new ObjectPrxHelperBase();
-            proxy.setup(ref);
+            proxy.setup(_reference.changeMode(IceInternal.Reference.ModeDatagram));
             return proxy;
         }
     }
 
+    public final boolean
+    ice_isDatagram()
+    {
+	return _reference.getMode() == IceInternal.Reference.ModeDatagram;
+    }
+
     public final ObjectPrx
-    ice_connectionId(String id)
+    ice_batchDatagram()
     {
-        IceInternal.Reference ref = _reference.changeConnectionId(id);
-        if(ref.equals(_reference))
+        if(_reference.getMode() == IceInternal.Reference.ModeBatchDatagram)
         {
             return this;
         }
         else
         {
             ObjectPrxHelperBase proxy = new ObjectPrxHelperBase();
-            proxy.setup(ref);
+            proxy.setup(_reference.changeMode(IceInternal.Reference.ModeBatchDatagram));
             return proxy;
         }
     }
 
+    public final boolean
+    ice_isBatchDatagram()
+    {
+	return _reference.getMode() == IceInternal.Reference.ModeBatchDatagram;
+    }
+
     public final ObjectPrx
-    ice_router(Ice.RouterPrx router)
+    ice_compress(boolean co)
     {
-        IceInternal.Reference ref = _reference.changeRouter(router);
+        IceInternal.Reference ref = _reference.changeCompress(co);
         if(ref.equals(_reference))
         {
             return this;
@@ -602,9 +621,9 @@ public class ObjectPrxHelperBase implements ObjectPrx
     }
 
     public final ObjectPrx
-    ice_locator(Ice.LocatorPrx locator)
+    ice_timeout(int t)
     {
-        IceInternal.Reference ref = _reference.changeLocator(locator);
+        IceInternal.Reference ref = _reference.changeTimeout(t);
         if(ref.equals(_reference))
         {
             return this;
@@ -618,9 +637,9 @@ public class ObjectPrxHelperBase implements ObjectPrx
     }
 
     public final ObjectPrx
-    ice_collocationOptimization(boolean b)
+    ice_connectionId(String id)
     {
-        IceInternal.Reference ref = _reference.changeCollocationOptimization(b);
+        IceInternal.Reference ref = _reference.changeConnectionId(id);
         if(ref.equals(_reference))
         {
             return this;
@@ -837,16 +856,10 @@ public class ObjectPrxHelperBase implements ObjectPrx
 	    // using a router, then add this proxy to the router info
 	    // object.
 	    //
-	    try
-	    {
-		IceInternal.RoutableReference rr = (IceInternal.RoutableReference)_reference;
-		if(rr != null && rr.getRouterInfo() != null)
-		{
-		    rr.getRouterInfo().addProxy(this);
-		}
-	    }
-	    catch(ClassCastException e)
+	    IceInternal.RouterInfo ri = _reference.getRouterInfo();
+	    if(ri != null)
 	    {
+		ri.addProxy(this);
 	    }
 	}