summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2009-07-15 22:20:47 +0200
committerJose <jose@zeroc.com>2009-07-15 22:20:47 +0200
commit4293e7261847b861b89a69f54606719538f66b11 (patch)
tree7edfe18ab1d65b2262feb0070bb423f594284456 /java/src
parent4019 - Minimal demo still not minimimal (diff)
downloadice-4293e7261847b861b89a69f54606719538f66b11.tar.bz2
ice-4293e7261847b861b89a69f54606719538f66b11.tar.xz
ice-4293e7261847b861b89a69f54606719538f66b11.zip
Add ice_getConnectionId to Proxy api.
commit 96047f7c59f38bcdf8b920d2acad61be96db7101 Author: Jose Gutierrez <pepone@dhcppc0.(none)> Date: Wed Jul 15 22:16:38 2009 +0200 Add ice_getConnectionId to Proxy api.
Diffstat (limited to 'java/src')
-rw-r--r--java/src/Ice/ObjectPrx.java8
-rw-r--r--java/src/Ice/ObjectPrxHelperBase.java12
-rw-r--r--java/src/IceInternal/FixedReference.java6
-rw-r--r--java/src/IceInternal/Reference.java1
-rw-r--r--java/src/IceInternal/RoutableReference.java6
5 files changed, 33 insertions, 0 deletions
diff --git a/java/src/Ice/ObjectPrx.java b/java/src/Ice/ObjectPrx.java
index 0ec89ee0387..2ef3c42575e 100644
--- a/java/src/Ice/ObjectPrx.java
+++ b/java/src/Ice/ObjectPrx.java
@@ -263,6 +263,14 @@ public interface ObjectPrx
int ice_getLocatorCacheTimeout();
/**
+ * Returns the connection id of this proxy.
+ *
+ * @return The connection id.
+ *
+ **/
+ String ice_getConnectionId();
+
+ /**
* Creates a new proxy that is identical to this proxy, except for the locator cache timeout.
*
* @param newTimeout The new locator cache timeout (in seconds).
diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java
index 285f6d7e6a6..87978423164 100644
--- a/java/src/Ice/ObjectPrxHelperBase.java
+++ b/java/src/Ice/ObjectPrxHelperBase.java
@@ -587,6 +587,18 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable
}
/**
+ * Returns the connection id of this proxy.
+ *
+ * @return The connection id.
+ *
+ **/
+ public final String
+ ice_getConnectionId()
+ {
+ return _reference.getConnectionId();
+ }
+
+ /**
* Creates a new proxy that is identical to this proxy, except for the locator cache timeout.
*
* @param newTimeout The new locator cache timeout (in seconds).
diff --git a/java/src/IceInternal/FixedReference.java b/java/src/IceInternal/FixedReference.java
index 1501576c40d..83b228f7865 100644
--- a/java/src/IceInternal/FixedReference.java
+++ b/java/src/IceInternal/FixedReference.java
@@ -78,6 +78,12 @@ public class FixedReference extends Reference
return 0;
}
+ public String
+ getConnectionId()
+ {
+ return "";
+ }
+
public Reference
changeEndpoints(EndpointI[] newEndpoints)
{
diff --git a/java/src/IceInternal/Reference.java b/java/src/IceInternal/Reference.java
index 5b9deb89f6a..4d51d42a646 100644
--- a/java/src/IceInternal/Reference.java
+++ b/java/src/IceInternal/Reference.java
@@ -75,6 +75,7 @@ public abstract class Reference implements Cloneable
public abstract boolean getPreferSecure();
public abstract Ice.EndpointSelectionType getEndpointSelection();
public abstract int getLocatorCacheTimeout();
+ public abstract String getConnectionId();
//
// The change* methods (here and in derived classes) create
diff --git a/java/src/IceInternal/RoutableReference.java b/java/src/IceInternal/RoutableReference.java
index f73aa78a368..d5fc69633f1 100644
--- a/java/src/IceInternal/RoutableReference.java
+++ b/java/src/IceInternal/RoutableReference.java
@@ -65,6 +65,12 @@ public class RoutableReference extends Reference
return _locatorCacheTimeout;
}
+ public final String
+ getConnectionId()
+ {
+ return _connectionId;
+ }
+
public Reference
changeCompress(boolean newCompress)
{