summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2014-06-26 20:54:48 +0000
committerBernard Normier <bernard@zeroc.com>2014-06-26 20:54:48 +0000
commit005998b0fe3bcc3fb4e4a850b49164c4e19eb441 (patch)
treef221c20c1065ec13c81d7b5aa8d7bf056aef1e65 /java
parentFixed ICE-5546: Python Ice/converter demo (diff)
downloadice-005998b0fe3bcc3fb4e4a850b49164c4e19eb441.tar.bz2
ice-005998b0fe3bcc3fb4e4a850b49164c4e19eb441.tar.xz
ice-005998b0fe3bcc3fb4e4a850b49164c4e19eb441.zip
Fix for ICE-5515 (ice_staticId on proxies) in Java, C#, Python, Ruby and PHP (not complete in Python, Ruby and PHP)
Diffstat (limited to 'java')
-rw-r--r--java/src/Ice/ObjectPrxHelper.java13
-rw-r--r--java/test/Ice/operations/Twoways.java4
2 files changed, 17 insertions, 0 deletions
diff --git a/java/src/Ice/ObjectPrxHelper.java b/java/src/Ice/ObjectPrxHelper.java
index a4c054fd7e9..14bbc89f4da 100644
--- a/java/src/Ice/ObjectPrxHelper.java
+++ b/java/src/Ice/ObjectPrxHelper.java
@@ -142,4 +142,17 @@ public class ObjectPrxHelper extends ObjectPrxHelperBase
}
return d;
}
+
+ /**
+ * Returns the Slice type id of the interface or class associated
+ * with this proxy class.
+ *
+ * @return the type id, "::Ice::Object"
+ **/
+ public static String
+ ice_staticId()
+ {
+ return Ice.ObjectImpl.ice_staticId();
+ }
+
}
diff --git a/java/test/Ice/operations/Twoways.java b/java/test/Ice/operations/Twoways.java
index b13619728b6..58c152f65e8 100644
--- a/java/test/Ice/operations/Twoways.java
+++ b/java/test/Ice/operations/Twoways.java
@@ -27,6 +27,7 @@ import test.Ice.operations.Test.MyClassPrx;
import test.Ice.operations.Test.MyClassPrxHelper;
import test.Ice.operations.Test.MyClassPrxHolder;
import test.Ice.operations.Test.MyDerivedClass;
+import test.Ice.operations.Test.MyDerivedClassPrxHelper;
import test.Ice.operations.Test.MyEnum;
import test.Ice.operations.Test.MyStruct;
import test.Ice.operations.Test.MyEnumHolder;
@@ -84,6 +85,9 @@ class Twoways
test(p.ice_id().equals(MyDerivedClass.ice_staticId()));
+ test(MyDerivedClassPrxHelper.ice_staticId().equals(MyDerivedClass.ice_staticId()));
+ test(Ice.ObjectPrxHelper.ice_staticId().equals(Ice.ObjectImpl.ice_staticId()));
+
{
String[] ids = p.ice_ids();
test(ids.length == 3);