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[],