diff options
| author | Michi Henning <michi@zeroc.com> | 2003-09-04 02:11:46 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2003-09-04 02:11:46 +0000 |
| commit | 5ecbdf0ebe5efd151129d4422b30b7aefe11f9db (patch) | |
| tree | fca4840b748039de1d06e78170bb3c6ca23f6933 /cpp/src/Ice/Instance.cpp | |
| parent | Fixed IcePack test cleaning (diff) | |
| download | ice-5ecbdf0ebe5efd151129d4422b30b7aefe11f9db.tar.bz2 ice-5ecbdf0ebe5efd151129d4422b30b7aefe11f9db.tar.xz ice-5ecbdf0ebe5efd151129d4422b30b7aefe11f9db.zip | |
Fixed race condition in flushBatchRequests(): connections that are not yet
validated are now ignored when flushing.
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index 52ba8ea430d..770e7aef0cf 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -363,19 +363,16 @@ IceInternal::Instance::messageSizeMax() const void IceInternal::Instance::flushBatchRequests() { - OutgoingConnectionFactoryPtr factory; - std::map<std::string, ::Ice::ObjectAdapterIPtr> adapters; + OutgoingConnectionFactoryPtr connectionFactory; + ObjectAdapterFactoryPtr adapterFactory; { IceUtil::RecMutex::Lock sync(*this); - factory = _outgoingConnectionFactory; - adapters = _objectAdapterFactory->_adapters; - } - factory->flushBatchRequests(); - for(std::map<std::string, ::Ice::ObjectAdapterIPtr>::const_iterator p = adapters.begin(); p != adapters.end(); ++p) - { - p->second->flushBatchRequests(); + connectionFactory = _outgoingConnectionFactory; + adapterFactory = _objectAdapterFactory; } + connectionFactory->flushBatchRequests(); + adapterFactory->flushBatchRequests(); } IceInternal::Instance::Instance(const CommunicatorPtr& communicator, int& argc, char* argv[], |