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 /cpp/src/Ice/Outgoing.cpp | |
| 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 'cpp/src/Ice/Outgoing.cpp')
| -rw-r--r-- | cpp/src/Ice/Outgoing.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp index 4f75c9957e1..51f41bedd2b 100644 --- a/cpp/src/Ice/Outgoing.cpp +++ b/cpp/src/Ice/Outgoing.cpp @@ -87,7 +87,7 @@ IceInternal::Outgoing::Outgoing(RequestHandler* handler, const string& operation _handler(handler), _observer(observer), _state(StateUnsent), - _encoding(handler->getReference()->getEncoding()), + _encoding(checkForCompatibleEncoding(handler->getReference()->getEncoding())), _is(handler->getReference()->getInstance().get(), Ice::currentProtocolEncoding), _os(handler->getReference()->getInstance().get(), Ice::currentProtocolEncoding), _sent(false) |