diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2002-08-27 17:45:16 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2002-08-27 17:45:16 +0000 |
| commit | e807a59110d51d6597b1849f1c8d6f09bdbdebb1 (patch) | |
| tree | 5b9f1b5505d50213ec48566934c3d19937cb673b /TAO/tao/ORB.cpp | |
| parent | 7b5a429be6bcb7376736b32d9ef8b632abd3d45e (diff) | |
| download | ATCD-e807a59110d51d6597b1849f1c8d6f09bdbdebb1.tar.gz | |
ChangeLogTag: Tue Aug 27 12:40:12 2002 Balachandran Natarajan <bala@isis-server.vuse.vanderbilt.edu>
Diffstat (limited to 'TAO/tao/ORB.cpp')
| -rw-r--r-- | TAO/tao/ORB.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 79b3c941c03..67b90321570 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -174,12 +174,14 @@ void CORBA_ORB::shutdown (CORBA::Boolean wait_for_completion ACE_ENV_ARG_DECL) { + // We cannot lock the exceptions here. We need to propogate + // BAD_INV_ORDER exceptions if needed to the caller. Locking + // exceptions down would render us non-compliant with the spec. this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->orb_core ()->shutdown (wait_for_completion ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -201,8 +203,8 @@ CORBA_ORB::destroy (ACE_ENV_SINGLE_ARG_DECL) if (TAO_debug_level >= 3) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("CORBA::ORB::destroy() has been called on ORB <%s>.\n"), - ACE_TEXT_CHAR_TO_TCHAR(this->orb_core ()->orbid ()))); + ACE_LIB_TEXT ("CORBA::ORB::destroy() has been called on ORB <%s>.\n"), + ACE_TEXT_CHAR_TO_TCHAR (this->orb_core ()->orbid ()))); } this->orb_core ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); |