Added ice_communicator() and ice_toString() to proxies.

6 files changed, 44 insertions, 0 deletions

diff --git a/java/CHANGES b/java/CHANGES
index 7f8f8bbf4e9..9f7856ffbfa 100644
--- a/java/CHANGES
+++ b/java/CHANGES
@@ -1,6 +1,14 @@
 Changes since version 2.1.2
 ---------------------------
 
+- Added ice_communicator() to proxies. This function returns
+  the communicator that was used to create the proxy.
+
+- Added ice_toString() to proxies. This function returns
+  the stringified proxy. This function can be more convenient
+  to use than communicator.stringToProxy() because you do
+  not need the communicator to stringify a proxy that way.
+
 - Parsing a stringified proxy no longer completely fails if the proxy
   contains an endpoint type which is unknown to the Ice runtime as long
   as the proxy contains other endpoints which are known. A warning is
diff --git a/java/src/Ice/ObjectPrx.java b/java/src/Ice/ObjectPrx.java
index 201f7476cb5..c7d6ac1cca4 100644
--- a/java/src/Ice/ObjectPrx.java
+++ b/java/src/Ice/ObjectPrx.java
@@ -13,6 +13,10 @@ public interface ObjectPrx
 {
     int ice_hash();
 
+    Communicator ice_communicator();
+
+    String ice_toString();
+
     boolean ice_isA(String __id);
     boolean ice_isA(String __id, java.util.Map __context);
 
diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java
index 92e9fd26712..5f324bd307f 100644
--- a/java/src/Ice/ObjectPrxHelperBase.java
+++ b/java/src/Ice/ObjectPrxHelperBase.java
@@ -23,6 +23,21 @@ public class ObjectPrxHelperBase implements ObjectPrx
         return _reference.hashCode();
     }
 
+    public final Communicator ice_communicator()
+    {
+        return _reference.getCommunicator();
+    }
+
+    public final String toString()
+    {
+        return _reference.toString();
+    }
+
+    public final String ice_toString()
+    {
+        return toString();
+    }
+
     public final boolean
     ice_isA(String __id)
     {
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java
index 1d3145c642c..4646c9123ac 100644
--- a/java/src/IceInternal/Instance.java
+++ b/java/src/IceInternal/Instance.java
@@ -11,6 +11,11 @@ package IceInternal;
 
 public final class Instance
 {
+    public Ice.Communicator communicator()
+    {
+        return _communicator;
+    }
+
     public Ice.Properties
     properties()
     {
@@ -298,6 +303,7 @@ public final class Instance
     public
     Instance(Ice.Communicator communicator, Ice.Properties properties)
     {
+        _communicator = communicator;
         _destroyed = false;
         _properties = properties;
 
@@ -685,6 +691,7 @@ public final class Instance
         }
     }
 
+    private Ice.Communicator _communicator;
     private boolean _destroyed;
     private final Ice.Properties _properties; // Immutable, not reset by destroy().
     private Ice.Logger _logger; // Not reset by destroy().
diff --git a/java/src/IceInternal/Reference.java b/java/src/IceInternal/Reference.java
index b4289d0913e..d8a5f79102b 100644
--- a/java/src/IceInternal/Reference.java
+++ b/java/src/IceInternal/Reference.java
@@ -62,6 +62,11 @@ public abstract class Reference implements Cloneable
 
     }
 
+    public final Ice.Communicator getCommunicator()
+    {
+        return _instance.communicator();
+    }
+
     public abstract boolean getSecure();
     public abstract Endpoint[] getEndpoints();
     public abstract boolean getCollocationOptimization();
diff --git a/java/test/Ice/operations/AllTests.java b/java/test/Ice/operations/AllTests.java
index 8034b17675c..8fe0b625303 100644
--- a/java/test/Ice/operations/AllTests.java
+++ b/java/test/Ice/operations/AllTests.java
@@ -28,6 +28,11 @@ public class AllTests
         test(base != null);
         System.out.println("ok");
 
+    	System.out.print("testing ice_communicator... ");
+	System.out.flush();
+	test(base.ice_communicator() == communicator);
+	System.out.println("ok");
+
         System.out.print("testing checked cast... ");
         System.out.flush();
         Test.MyClassPrx cl = Test.MyClassPrxHelper.checkedCast(base);