diff options
Diffstat (limited to 'cppe/src/IceE/Connection.cpp')
| -rwxr-xr-x | cppe/src/IceE/Connection.cpp | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/cppe/src/IceE/Connection.cpp b/cppe/src/IceE/Connection.cpp index 91074b02ff2..4c71ad1bb3f 100755 --- a/cppe/src/IceE/Connection.cpp +++ b/cppe/src/IceE/Connection.cpp @@ -786,8 +786,7 @@ Ice::Connection::flushBatchRequestsInternal(bool ignoreInUse) void Ice::Connection::resetBatch(bool resetInUse) { - BasicStream dummy(_instance.get(), _instance->messageSizeMax(), _instance->initializationData().stringConverter, - _instance->initializationData().wstringConverter, _batchAutoFlush); + BasicStream dummy(_instance.get(), _instance->messageSizeMax(), _batchAutoFlush); _batchStream.swap(dummy); _batchRequestNum = 0; _batchMarker = 0; @@ -1011,14 +1010,12 @@ Ice::Connection::Connection(const InstancePtr& instance, _in(_instance.get(), this, _stream, adapter), #endif #ifndef ICEE_PURE_BLOCKING_CLIENT - _stream(_instance.get(), _instance->messageSizeMax(), _instance->initializationData().stringConverter, - _instance->initializationData().wstringConverter), + _stream(_instance.get(), _instance->messageSizeMax()), #endif #ifdef ICEE_HAS_BATCH _batchAutoFlush( _instance->initializationData().properties->getPropertyAsIntWithDefault("Ice.BatchAutoFlush", 1) > 0), - _batchStream(_instance.get(), _instance->messageSizeMax(), _instance->initializationData().stringConverter, - _instance->initializationData().wstringConverter, _batchAutoFlush), + _batchStream(_instance.get(), _instance->messageSizeMax(), _batchAutoFlush), _batchStreamInUse(false), _batchRequestNum(0), _batchMarker(0), @@ -1158,9 +1155,7 @@ Ice::Connection::validate() #ifndef ICEE_PURE_CLIENT if(active) { - BasicStream os(_instance.get(), _instance->messageSizeMax(), - _instance->initializationData().stringConverter, - _instance->initializationData().wstringConverter); + BasicStream os(_instance.get(), _instance->messageSizeMax()); os.write(magic[0]); os.write(magic[1]); os.write(magic[2]); @@ -1189,9 +1184,7 @@ Ice::Connection::validate() else #endif { - BasicStream is(_instance.get(), _instance->messageSizeMax(), - _instance->initializationData().stringConverter, - _instance->initializationData().wstringConverter); + BasicStream is(_instance.get(), _instance->messageSizeMax()); is.b.resize(headerSize); is.i = is.b.begin(); try @@ -1461,8 +1454,7 @@ Ice::Connection::initiateShutdown() const // // Before we shut down, we send a close connection message. // - BasicStream os(_instance.get(), _instance->messageSizeMax(), _instance->initializationData().stringConverter, - _instance->initializationData().wstringConverter); + BasicStream os(_instance.get(), _instance->messageSizeMax()); os.write(magic[0]); os.write(magic[1]); os.write(magic[2]); |