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/Outgoing.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'cpp/src/Ice/Outgoing.cpp') diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp index c46b95bad14..85e15a53509 100644 --- a/cpp/src/Ice/Outgoing.cpp +++ b/cpp/src/Ice/Outgoing.cpp @@ -92,6 +92,8 @@ IceInternal::Outgoing::Outgoing(RequestHandler* handler, const string& operation _os(handler->getReference()->getInstance().get(), Ice::currentProtocolEncoding), _sent(false) { + checkSupportedProtocol(handler->getReference()->getProtocol()); + switch(_handler->getReference()->getMode()) { case Reference::ModeTwoway: @@ -561,6 +563,7 @@ IceInternal::BatchOutgoing::BatchOutgoing(RequestHandler* handler, InvocationObs _os(handler->getReference()->getInstance().get(), Ice::currentProtocolEncoding), _observer(observer) { + checkSupportedProtocol(handler->getReference()->getProtocol()); } IceInternal::BatchOutgoing::BatchOutgoing(ConnectionI* connection, Instance* instance, InvocationObserver& observer) : -- cgit v1.2.3