summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/OutgoingAsync.java
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2013-01-15 10:33:18 +0100
committerBenoit Foucher <benoit@zeroc.com>2013-01-15 10:33:18 +0100
commit9ee1bf93d1837e48ccb8b93d5b219bf48a1ba909 (patch)
tree387bf0e45be6e75e2af2fcf36eb7588000578e2c /java/src/IceInternal/OutgoingAsync.java
parentFixed add-in unexpected exception (diff)
downloadice-9ee1bf93d1837e48ccb8b93d5b219bf48a1ba909.tar.bz2
ice-9ee1bf93d1837e48ccb8b93d5b219bf48a1ba909.tar.xz
ice-9ee1bf93d1837e48ccb8b93d5b219bf48a1ba909.zip
Fixed ICE-5126 - Improved client side encoding checks
Diffstat (limited to 'java/src/IceInternal/OutgoingAsync.java')
-rw-r--r--java/src/IceInternal/OutgoingAsync.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/IceInternal/OutgoingAsync.java b/java/src/IceInternal/OutgoingAsync.java
index b2b66a3be88..7e89ec96058 100644
--- a/java/src/IceInternal/OutgoingAsync.java
+++ b/java/src/IceInternal/OutgoingAsync.java
@@ -15,7 +15,7 @@ public class OutgoingAsync extends Ice.AsyncResult implements OutgoingAsyncMessa
{
super(prx.ice_getCommunicator(), ((Ice.ObjectPrxHelperBase)prx).__reference().getInstance(), operation, cb);
_proxy = (Ice.ObjectPrxHelperBase)prx;
- _encoding = _proxy.__reference().getEncoding();
+ _encoding = Protocol.checkForCompatibleEncoding(_proxy.__reference().getEncoding());
}
public void __prepare(String operation, Ice.OperationMode mode, java.util.Map<String, String> ctx,