diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-04-18 14:33:16 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-04-18 14:33:16 +0200 |
| commit | 2ba4d4e0ca7aeade69ee00ab17d5fa1b69372ffc (patch) | |
| tree | 0a381f9b284eb7ca5acc9bca5a97659d19874f9d /cpp/src/Ice/ConnectRequestHandler.cpp | |
| parent | ICE-4828 - Buffer.h undeclared ptrdiff_t issue on OpenSUSE (diff) | |
| download | ice-2ba4d4e0ca7aeade69ee00ab17d5fa1b69372ffc.tar.bz2 ice-2ba4d4e0ca7aeade69ee00ab17d5fa1b69372ffc.tar.xz ice-2ba4d4e0ca7aeade69ee00ab17d5fa1b69372ffc.zip | |
Added support for encoding versioning
Diffstat (limited to 'cpp/src/Ice/ConnectRequestHandler.cpp')
| -rw-r--r-- | cpp/src/Ice/ConnectRequestHandler.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/ConnectRequestHandler.cpp b/cpp/src/Ice/ConnectRequestHandler.cpp index d2c0aa6bc9b..b235a8a4035 100644 --- a/cpp/src/Ice/ConnectRequestHandler.cpp +++ b/cpp/src/Ice/ConnectRequestHandler.cpp @@ -112,7 +112,7 @@ ConnectRequestHandler::ConnectRequestHandler(const ReferencePtr& ref, _flushing(false), _batchRequestInProgress(false), _batchRequestsSize(sizeof(requestBatchHdr)), - _batchStream(ref->getInstance().get(), _batchAutoFlush), + _batchStream(ref->getInstance().get(), Ice::currentProtocolEncoding, _batchAutoFlush), _updateRequestHandler(false) { } @@ -182,7 +182,7 @@ ConnectRequestHandler::finishBatchRequest(BasicStream* os) _batchRequestsSize += _batchStream.b.size(); Request req; - req.os = new BasicStream(_reference->getInstance().get(), _batchAutoFlush); + req.os = new BasicStream(_reference->getInstance().get(), Ice::currentProtocolEncoding, _batchAutoFlush); req.os->swap(_batchStream); _requests.push_back(req); return; @@ -202,7 +202,7 @@ ConnectRequestHandler::abortBatchRequest() _batchRequestInProgress = false; notifyAll(); - BasicStream dummy(_reference->getInstance().get(), _batchAutoFlush); + BasicStream dummy(_reference->getInstance().get(), Ice::currentProtocolEncoding, _batchAutoFlush); _batchStream.swap(dummy); _batchRequestsSize = sizeof(requestBatchHdr); @@ -427,7 +427,7 @@ ConnectRequestHandler::flushRequests() } else { - BasicStream os(req.os->instance()); + BasicStream os(req.os->instance(), Ice::currentProtocolEncoding); _connection->prepareBatchRequest(&os); try { |