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/Outgoing.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/Outgoing.cpp')
| -rw-r--r-- | cpp/src/Ice/Outgoing.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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) : |