diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2014-09-03 11:01:11 -0230 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2014-09-03 11:01:11 -0230 |
| commit | 3b0588532354adf7bf3b86e611a8ae4996bfe6ad (patch) | |
| tree | 253961cb83af7bc3b1dfc7633a8f934789476cd1 /java/src/Ice/ObjectPrxHelper.java | |
| parent | More work on ICE-2400: the send log thread now uses a separate communicator t... (diff) | |
| download | ice-3b0588532354adf7bf3b86e611a8ae4996bfe6ad.tar.bz2 ice-3b0588532354adf7bf3b86e611a8ae4996bfe6ad.tar.xz ice-3b0588532354adf7bf3b86e611a8ae4996bfe6ad.zip | |
- C#, Java: Removed Outgoing, fixed generated code to make synchronous
requests using AMI.
- Java: AsyncResult is now an interface.
- Added --arg to allTests.py.
- Fixed operations, adapterDeactivation and metrics test to work with
background IO.
- Added Collocated interrupt test.
- Added support for batch oneway requests using AMI.
- Added test in operations for batch oneway requests using AMI.
Diffstat (limited to 'java/src/Ice/ObjectPrxHelper.java')
| -rw-r--r-- | java/src/Ice/ObjectPrxHelper.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/java/src/Ice/ObjectPrxHelper.java b/java/src/Ice/ObjectPrxHelper.java index 45c290df6e2..c390823e61f 100644 --- a/java/src/Ice/ObjectPrxHelper.java +++ b/java/src/Ice/ObjectPrxHelper.java @@ -152,7 +152,6 @@ public class ObjectPrxHelper extends ObjectPrxHelperBase public static String ice_staticId() { - return Ice.ObjectImpl.ice_staticId(); + return Ice.ObjectImpl.ice_staticId(); } - } |