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/Instance.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/Instance.cpp')
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index 7bb3fb1cdc6..24540c65491 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -374,28 +374,6 @@ IceInternal::Instance::serverACM() const return _serverACM; } -void -IceInternal::Instance::flushBatchRequests() -{ - OutgoingConnectionFactoryPtr connectionFactory; - ObjectAdapterFactoryPtr adapterFactory; - - { - IceUtil::RecMutex::Lock sync(*this); - - if(_state == StateDestroyed) - { - throw CommunicatorDestroyedException(__FILE__, __LINE__); - } - - connectionFactory = _outgoingConnectionFactory; - adapterFactory = _objectAdapterFactory; - } - - connectionFactory->flushBatchRequests(); - adapterFactory->flushBatchRequests(); -} - Identity IceInternal::Instance::stringToIdentity(const string& s) const { |