diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-11-13 10:17:27 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-11-13 10:17:27 +0100 |
| commit | 99b44d083eeee5583adfe642081a827224fa1309 (patch) | |
| tree | 46bb3af634cbd5d90b9e5d46099f4e0e85f70ec6 /java/src/Ice/ObjectPrxHelperBase.java | |
| parent | Cosmetic updates to IceGrid Admin connection wizard (diff) | |
| download | ice-99b44d083eeee5583adfe642081a827224fa1309.tar.bz2 ice-99b44d083eeee5583adfe642081a827224fa1309.tar.xz ice-99b44d083eeee5583adfe642081a827224fa1309.zip | |
Fixed ICE-4927: fixed proxy encoding to marshal protocol/encoding version instead of encoding it in endpoints
Diffstat (limited to 'java/src/Ice/ObjectPrxHelperBase.java')
| -rw-r--r-- | java/src/Ice/ObjectPrxHelperBase.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java index 7f62f46ab80..d1fc853f6c1 100644 --- a/java/src/Ice/ObjectPrxHelperBase.java +++ b/java/src/Ice/ObjectPrxHelperBase.java @@ -1451,7 +1451,6 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable } else { - IceInternal.Protocol.checkSupportedEncoding(e); return newInstance(_reference.changeEncoding(e)); } } @@ -1464,7 +1463,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable public final Ice.EncodingVersion ice_getEncodingVersion() { - return _reference.getEncoding(); + return (Ice.EncodingVersion)_reference.getEncoding().clone(); } /** |