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/OutgoingAsync.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/OutgoingAsync.cpp')
| -rw-r--r-- | cpp/src/Ice/OutgoingAsync.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index 5ffa11d3b41..04e9eabdc02 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -426,7 +426,7 @@ IceInternal::OutgoingAsync::OutgoingAsync(const ObjectPrx& prx, const Ice::LocalObjectPtr& cookie) : AsyncResult(prx->ice_getCommunicator(), prx->__reference()->getInstance(), operation, delegate, cookie), _proxy(prx), - _encoding(prx->__reference()->getEncoding()) + _encoding(checkForCompatibleEncoding(prx->__reference()->getEncoding())) { } |