diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/ConnectionI.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/Ice/InstrumentationI.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/Ice/InstrumentationI.h | 8 | ||||
| -rw-r--r-- | cpp/src/Ice/MetricsAdminI.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/OutgoingAsync.cpp | 13 |
5 files changed, 12 insertions, 18 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index f4ecf9e3f51..c984fbab901 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -1257,19 +1257,19 @@ Ice::ConnectionI::finishAsync(SocketOperation operation) { if(operation & SocketOperationWrite) { + _transceiver->finishWrite(_writeStream); if(_observer) { _observer.finishWrite(_writeStream.i); } - _transceiver->finishWrite(_writeStream); } else if(operation & SocketOperationRead) { + _transceiver->finishRead(_readStream); if(_observer && !_readHeader) { _observer.finishRead(_readStream.i); } - _transceiver->finishRead(_readStream); } } catch(const Ice::LocalException& ex) diff --git a/cpp/src/Ice/InstrumentationI.cpp b/cpp/src/Ice/InstrumentationI.cpp index 5259d4a0441..b3b94b1e061 100644 --- a/cpp/src/Ice/InstrumentationI.cpp +++ b/cpp/src/Ice/InstrumentationI.cpp @@ -242,7 +242,6 @@ public: add("operation", &DispatchHelper::getCurrent, &Current::operation); add("identity", &DispatchHelper::getIdentity); add("facet", &DispatchHelper::getCurrent, &Current::facet); - add("encoding", &DispatchHelper::getCurrent, &Current::encoding); add("mode", &DispatchHelper::getMode); setDefault(&DispatchHelper::resolve); @@ -443,7 +442,7 @@ public: { os << _proxy << " [" << _operation << ']'; } - catch(const FixedProxyException& ex) + catch(const FixedProxyException&) { os << _proxy->ice_getCommunicator()->identityToString(_proxy->ice_getIdentity()); os << " [" << _operation << ']'; diff --git a/cpp/src/Ice/InstrumentationI.h b/cpp/src/Ice/InstrumentationI.h index b6d64806413..45f537bef57 100644 --- a/cpp/src/Ice/InstrumentationI.h +++ b/cpp/src/Ice/InstrumentationI.h @@ -37,14 +37,6 @@ public: virtual void retried(); virtual Ice::Instrumentation::ObserverPtr getRemoteObserver(const Ice::ConnectionInfoPtr&, const Ice::EndpointPtr&); - - -private: - - friend class CommunicatorObserverI; - void initLogger(const Ice::LoggerPtr&); - - const Ice::LoggerPtr _logger; }; class CommunicatorObserverI : public Ice::Instrumentation::CommunicatorObserver diff --git a/cpp/src/Ice/MetricsAdminI.cpp b/cpp/src/Ice/MetricsAdminI.cpp index 0c91b0e4791..cdf96b721c2 100644 --- a/cpp/src/Ice/MetricsAdminI.cpp +++ b/cpp/src/Ice/MetricsAdminI.cpp @@ -52,7 +52,7 @@ validateProperties(const string& prefix, const PropertiesPtr& properties, const for(PropertyDict::const_iterator p = props.begin(); p != props.end(); ++p) { bool valid = false; - for(unsigned int i = 0; i < cnt; ++i) + for(int i = 0; i < cnt; ++i) { string prop = prefix + suffixes[i]; if(IceUtilInternal::match(p->first, prop)) diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index 2224b7dee97..b7bcc5c4104 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -1015,9 +1015,11 @@ IceInternal::CommunicatorBatchOutgoingAsync::flushConnection(const ConnectionIPt { public: - BatchOutgoingAsyncI(const CommunicatorBatchOutgoingAsyncPtr& outAsync) : - BatchOutgoingAsync(outAsync->_communicator, outAsync->_instance, outAsync->_operation, __dummyCallback, 0), - _outAsync(outAsync) + BatchOutgoingAsyncI(const CommunicatorBatchOutgoingAsyncPtr& outAsync, + const InstancePtr& instance, + InvocationObserver& observer) : + BatchOutgoingAsync(outAsync->getCommunicator(), instance, outAsync->getOperation(), __dummyCallback, 0), + _outAsync(outAsync), _observer(observer) { } @@ -1036,12 +1038,13 @@ IceInternal::CommunicatorBatchOutgoingAsync::flushConnection(const ConnectionIPt virtual void __attachRemoteObserver(const Ice::ConnectionInfoPtr& connection, const Ice::EndpointPtr& endpt) { - _remoteObserver.attach(_outAsync->_observer.getRemoteObserver(connection, endpt)); + _remoteObserver.attach(_observer.getRemoteObserver(connection, endpt)); } private: const CommunicatorBatchOutgoingAsyncPtr _outAsync; + InvocationObserver& _observer; }; { @@ -1049,7 +1052,7 @@ IceInternal::CommunicatorBatchOutgoingAsync::flushConnection(const ConnectionIPt ++_useCount; } - AsyncStatus status = con->flushAsyncBatchRequests(new BatchOutgoingAsyncI(this)); + AsyncStatus status = con->flushAsyncBatchRequests(new BatchOutgoingAsyncI(this, _instance, _observer)); if(!(status & AsyncStatusSent)) { _sentSynchronously = false; |