From 99b44d083eeee5583adfe642081a827224fa1309 Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Tue, 13 Nov 2012 10:17:27 +0100 Subject: Fixed ICE-4927: fixed proxy encoding to marshal protocol/encoding version instead of encoding it in endpoints --- cpp/src/Ice/OutgoingAsync.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'cpp/src/Ice/OutgoingAsync.cpp') 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. -- cgit v1.2.3