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 /cpp/src/Ice/OutgoingAsync.cpp | |
| 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 'cpp/src/Ice/OutgoingAsync.cpp')
| -rw-r--r-- | cpp/src/Ice/OutgoingAsync.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index 5dd2238944f..33ac9dee0f5 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -438,6 +438,8 @@ IceInternal::OutgoingAsync::__prepare(const std::string& operation, OperationMod _mode = mode; _sentSynchronously = false; + checkSupportedProtocol(_proxy->__reference()->getProtocol()); + _observer.attach(_proxy.get(), operation, context); // @@ -935,6 +937,8 @@ IceInternal::ProxyBatchOutgoingAsync::ProxyBatchOutgoingAsync(const Ice::ObjectP void IceInternal::ProxyBatchOutgoingAsync::__send() { + checkSupportedProtocol(_proxy->__reference()->getProtocol()); + // // We don't automatically retry if ice_flushBatchRequests fails. Otherwise, if some batch // requests were queued with the connection, they would be lost without being noticed. |