diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2001-12-27 18:38:22 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2001-12-27 18:38:22 +0000 |
| commit | ca2b7f71b4133faf486a677b3744904c0f759471 (patch) | |
| tree | 2ea5e06f611c338f8160a0c3bd36d069118926fe /cpp/src/IcePack/Activator.cpp | |
| parent | file run.py was initially added on branch IceThread. (diff) | |
| download | ice-ca2b7f71b4133faf486a677b3744904c0f759471.tar.bz2 ice-ca2b7f71b4133faf486a677b3744904c0f759471.tar.xz ice-ca2b7f71b4133faf486a677b3744904c0f759471.zip | |
IceThread merge.
Diffstat (limited to 'cpp/src/IcePack/Activator.cpp')
| -rw-r--r-- | cpp/src/IcePack/Activator.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/cpp/src/IcePack/Activator.cpp b/cpp/src/IcePack/Activator.cpp index 19ce84ca1f2..34bc371e519 100644 --- a/cpp/src/IcePack/Activator.cpp +++ b/cpp/src/IcePack/Activator.cpp @@ -60,12 +60,6 @@ IcePack::Activator::run() s << "exception in process termination listener:\n" << ex; _communicator->getLogger()->error(s.str()); } - catch (const JTCException& ex) - { - ostringstream s; - s << "exception in process termination listener:\n" << ex; - _communicator->getLogger()->error(s.str()); - } catch (...) { _communicator->getLogger()->error("unknown exception in process termination listener"); @@ -75,7 +69,7 @@ IcePack::Activator::run() void IcePack::Activator::destroy() { - JTCSyncT<JTCMutex> sync(*this); + IceUtil::Mutex::Lock sync(*this); if (_destroy) // Don't destroy twice { @@ -89,7 +83,7 @@ IcePack::Activator::destroy() bool IcePack::Activator::activate(const ServerDescription& desc) { - JTCSyncT<JTCMutex> sync(*this); + IceUtil::Mutex::Lock sync(*this); if (_destroy) { @@ -213,7 +207,7 @@ IcePack::Activator::terminationListener() FD_SET(_fdIntrRead, &fdSet); { - JTCSyncT<JTCMutex> sync(*this); + IceUtil::Mutex::Lock sync(*this); if (_destroy) { @@ -248,7 +242,7 @@ IcePack::Activator::terminationListener() } { - JTCSyncT<JTCMutex> sync(*this); + IceUtil::Mutex::Lock sync(*this); if (FD_ISSET(_fdIntrRead, &fdSet)) { |