diff options
| author | Michi Henning <michi@zeroc.com> | 2009-12-09 15:12:12 +1000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2009-12-09 15:12:12 +1000 |
| commit | d0d27bb7cf7b5ff8f9f3028f63f650f1d0b01678 (patch) | |
| tree | 9524523d712bca42f6bd36fabd72c76371ecdca8 /cpp/src/Ice/ObjectAdapterI.cpp | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| parent | fix for cpp/test/Ice/Makefile.mak (diff) | |
| download | ice-d0d27bb7cf7b5ff8f9f3028f63f650f1d0b01678.tar.bz2 ice-d0d27bb7cf7b5ff8f9f3028f63f650f1d0b01678.tar.xz ice-d0d27bb7cf7b5ff8f9f3028f63f650f1d0b01678.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index 4c3a0f5335e..69363ee91db 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -764,14 +764,18 @@ Ice::ObjectAdapterI::isLocal(const ObjectPrx& proxy) const } void -Ice::ObjectAdapterI::flushBatchRequests() +Ice::ObjectAdapterI::flushAsyncBatchRequests(const CommunicatorBatchOutgoingAsyncPtr& outAsync) { vector<IncomingConnectionFactoryPtr> f; { IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this); f = _incomingConnectionFactories; } - for_each(f.begin(), f.end(), Ice::voidMemFun(&IncomingConnectionFactory::flushBatchRequests)); + + for(vector<IncomingConnectionFactoryPtr>::const_iterator p = f.begin(); p != f.end(); ++p) + { + (*p)->flushAsyncBatchRequests(outAsync); + } } void |