diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2002-11-23 14:37:46 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2002-11-23 14:37:46 +0000 |
| commit | 470a28fce573ec04aed074f9114295662114c870 (patch) | |
| tree | 84ea896c61cd7305401890c727e00061c5c624ad /cpp/src/IcePack/ActivatorI.cpp | |
| parent | - Added DBEnvironment::openDBWithTxn (required by BerkeleyDB 4.1.2) (diff) | |
| download | ice-470a28fce573ec04aed074f9114295662114c870.tar.bz2 ice-470a28fce573ec04aed074f9114295662114c870.tar.xz ice-470a28fce573ec04aed074f9114295662114c870.zip | |
- Added DBEnvironment::openDBWithTxn (required by BerkeleyDB 4.1.2)
- Improved dispatch exception warnings.
- Fix the exception test to disable dispatch warnings.
- Fixed a bug in IcePack where a server adapter would wait for the server
activation even though the node was being shutdown.
- Fixed XML transform tests to use openDBWithTxn.
Diffstat (limited to 'cpp/src/IcePack/ActivatorI.cpp')
| -rw-r--r-- | cpp/src/IcePack/ActivatorI.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IcePack/ActivatorI.cpp b/cpp/src/IcePack/ActivatorI.cpp index b2f85b2e66b..27a2e971436 100644 --- a/cpp/src/IcePack/ActivatorI.cpp +++ b/cpp/src/IcePack/ActivatorI.cpp @@ -350,7 +350,7 @@ IcePack::ActivatorI::deactivate(const ServerPtr& server) // Send a SIGTERM to the process. // int ret = ::kill(static_cast<pid_t>(pid), SIGTERM); - if(ret != 0 && ret != ESRCH) + if(ret != 0 && getSystemErrno() != ESRCH) { SyscallException ex(__FILE__, __LINE__); ex.error = getSystemErrno(); @@ -381,7 +381,7 @@ IcePack::ActivatorI::kill(const ServerPtr& server) // Send a SIGKILL to the process. // int ret = ::kill(static_cast<pid_t>(pid), SIGKILL); - if(ret != 0 && ret != ESRCH) + if(ret != 0 && getSystemErrno() != ESRCH) { SyscallException ex(__FILE__, __LINE__); ex.error = getSystemErrno(); |