diff options
| author | Marc Laukien <marc@zeroc.com> | 2002-07-30 18:51:27 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2002-07-30 18:51:27 +0000 |
| commit | 3414f16fd4d530f6faf167b7f98434bee805a073 (patch) | |
| tree | c8b6e9744ba53a84c82f94c305cb967cdf298809 /cpp/src/Ice/ObjectAdapterI.cpp | |
| parent | Removed IceBox.ServiceManager property. (diff) | |
| download | ice-3414f16fd4d530f6faf167b7f98434bee805a073.tar.bz2 ice-3414f16fd4d530f6faf167b7f98434bee805a073.tar.xz ice-3414f16fd4d530f6faf167b7f98434bee805a073.zip | |
fixed mutex bug
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index a623aa1318b..b4dac6d00e3 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -127,6 +127,13 @@ Ice::ObjectAdapterI::deactivate() for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(), Ice::voidMemFun(&IncomingConnectionFactory::destroy)); + // + // Don't do a _incomingConnectionFactories.clear()! + // _incomingConnectionFactories is immutable. Even if all elements + // are destroyed, the elements are still needed by + // waitForDeactivate(). + // + _instance->outgoingConnectionFactory()->removeAdapter(this); _activeServantMap.clear(); |