diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-01-15 10:33:18 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-01-15 10:33:18 +0100 |
| commit | 9ee1bf93d1837e48ccb8b93d5b219bf48a1ba909 (patch) | |
| tree | 387bf0e45be6e75e2af2fcf36eb7588000578e2c /java/src/IceInternal/Outgoing.java | |
| parent | Fixed add-in unexpected exception (diff) | |
| download | ice-9ee1bf93d1837e48ccb8b93d5b219bf48a1ba909.tar.bz2 ice-9ee1bf93d1837e48ccb8b93d5b219bf48a1ba909.tar.xz ice-9ee1bf93d1837e48ccb8b93d5b219bf48a1ba909.zip | |
Fixed ICE-5126 - Improved client side encoding checks
Diffstat (limited to 'java/src/IceInternal/Outgoing.java')
| -rw-r--r-- | java/src/IceInternal/Outgoing.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/IceInternal/Outgoing.java b/java/src/IceInternal/Outgoing.java index ae5b60f3da9..b176fed16df 100644 --- a/java/src/IceInternal/Outgoing.java +++ b/java/src/IceInternal/Outgoing.java @@ -23,7 +23,7 @@ public final class Outgoing implements OutgoingMessageCallback _sent = false; _handler = handler; _observer = observer; - _encoding = handler.getReference().getEncoding(); + _encoding = Protocol.checkForCompatibleEncoding(handler.getReference().getEncoding()); _os = new BasicStream(_handler.getReference().getInstance(), Protocol.currentProtocolEncoding); Protocol.checkSupportedProtocol(_handler.getReference().getProtocol()); @@ -44,7 +44,7 @@ public final class Outgoing implements OutgoingMessageCallback _sent = false; _handler = handler; _observer = observer; - _encoding = handler.getReference().getEncoding(); + _encoding = Protocol.checkForCompatibleEncoding(handler.getReference().getEncoding()); Protocol.checkSupportedProtocol(_handler.getReference().getProtocol()); |