diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-07-21 12:03:46 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-07-21 12:03:46 +0000 |
| commit | 3e62eacb5e3819b38f54f0b092bfbeef6c107a09 (patch) | |
| tree | 1eba22a51f443d85c508e842afdda7cf660c16b7 | |
| parent | a468047906b4f18046ad9bb10f743eb0d758b2fc (diff) | |
| download | ATCD-3e62eacb5e3819b38f54f0b092bfbeef6c107a09.tar.gz | |
ChangeLogTag: Fri Jul 21 11:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/tests/Bug_1551_Regression/Reply_Handler.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp index 3596677754b..c6f274953fe 100644 --- a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp +++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp @@ -40,8 +40,18 @@ Reply_Handler::short_sleep_excep ( ACE_TRY { - ex->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + if (ex) + { + ex->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + } + else + { + // Problem with the exceptionholder, instead of crashing, print + // an error to the log, this normally shouldn't happen but when + // there is a bug in TAO it can happen :-( + ACE_ERROR ((LM_ERROR, "ERROR: Got nill exceptionholder\n")); + } } ACE_CATCHANY { @@ -65,7 +75,7 @@ Reply_Handler::short_sleep_excep ( void Reply_Handler:: check_counter(ACE_ENV_SINGLE_ARG_DECL) { - long count = --counter_; + long const count = --counter_; if(count == 0) { // ACE_DEBUG((LM_DEBUG, "(%P|%t) Shut down client thread\n")); |