diff options
| author | Marc Laukien <marc@zeroc.com> | 2001-09-27 22:41:27 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2001-09-27 22:41:27 +0000 |
| commit | 36eea2d8893de0ef19887c7feb8814b74beece0f (patch) | |
| tree | 55d4ec453a4e00a9a5b6d42c2850f1c9d8d9efc5 /cpp/src/Ice/ObjectAdapterI.cpp | |
| parent | more collocation stuff (diff) | |
| download | ice-36eea2d8893de0ef19887c7feb8814b74beece0f.tar.bz2 ice-36eea2d8893de0ef19887c7feb8814b74beece0f.tar.xz ice-36eea2d8893de0ef19887c7feb8814b74beece0f.zip | |
collocated evictor demo
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index a889541b3e6..0790e49de34 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -67,7 +67,7 @@ Ice::ObjectAdapterI::hold() } for_each(_collectorFactories.begin(), _collectorFactories.end(), - ::IceInternal::voidMemFun(& CollectorFactory::hold)); + ::IceInternal::voidMemFun(&CollectorFactory::hold)); } void @@ -77,11 +77,15 @@ Ice::ObjectAdapterI::deactivate() if (_collectorFactories.empty()) { - throw ObjectAdapterDeactivatedException(__FILE__, __LINE__); + // + // Ignore deactivation requests if the Object Adapter has + // already been deactivated. + // + return; } for_each(_collectorFactories.begin(), _collectorFactories.end(), - ::IceInternal::voidMemFun(& CollectorFactory::destroy)); + ::IceInternal::voidMemFun(&CollectorFactory::destroy)); _collectorFactories.clear(); _activeServantMap.clear(); _activeServantMapHint = _activeServantMap.begin(); |