diff options
| author | harrisb <harrisb@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-03-04 21:26:26 +0000 |
|---|---|---|
| committer | harrisb <harrisb@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-03-04 21:26:26 +0000 |
| commit | 6133148b572e99177467116d6d107d9c72f9db27 (patch) | |
| tree | cd91f94fde677e7ce1301f1cf9dd58154c97e8dc /TAO/orbsvcs | |
| parent | f12f6e2f1737914e7a82c46ee11a85a7912007b2 (diff) | |
| download | ATCD-6133148b572e99177467116d6d107d9c72f9db27.tar.gz | |
Mon Mar 4 21:24:45 UTC 2013 Byron Harris <harrisb@ociweb.com>
Diffstat (limited to 'TAO/orbsvcs')
| -rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/RestartServer/Terminator.cpp | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/servers_list/Terminator.cpp | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Terminator.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Terminator.cpp index 6f8c4338e0c..0f04632bbfc 100644 --- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Terminator.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Terminator.cpp @@ -24,7 +24,13 @@ Terminator::svc() while (1) { ACE_Message_Block* mb = 0; - ACE_ASSERT(this->getq(mb) != -1); + if (this->getq(mb) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%P|%t|%T) ERROR: Terminator::svc() could not get " + "message block from queue"), -1); + } + if (mb->msg_type () == ACE_Message_Block::MB_HANGUP) { mb->release (); diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/Terminator.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_list/Terminator.cpp index 0b304f45b1d..88fb72467bf 100644 --- a/TAO/orbsvcs/tests/ImplRepo/servers_list/Terminator.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/Terminator.cpp @@ -24,7 +24,13 @@ Terminator::svc() while (1) { ACE_Message_Block* mb = 0; - ACE_ASSERT(this->getq(mb) != -1); + if (this->getq(mb) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%P|%t|%T) ERROR: Terminator::svc() could not get " + "message block from queue"), -1); + } + if (mb->msg_type () == ACE_Message_Block::MB_HANGUP) { mb->release (); |