diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-12-06 11:06:07 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-12-06 11:06:07 +0100 |
| commit | 217a5c33ac844f9f37796daf1e9feb681b02b718 (patch) | |
| tree | 4372281785218a101a0d7b0122ab4e2704c81d1e /TAO/orbsvcs/ImplRepo_Service | |
| parent | e207ba1bfbb8e8cd6591132a2120508e454b8dc9 (diff) | |
| download | ATCD-217a5c33ac844f9f37796daf1e9feb681b02b718.tar.gz | |
Log some exceptions only when debugging is enabled and some layout changes
* TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp:
* TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
* TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
* TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp:
Diffstat (limited to 'TAO/orbsvcs/ImplRepo_Service')
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp | 4 |
4 files changed, 13 insertions, 9 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp index a8447aa98da..03c0ac49488 100644 --- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp @@ -314,7 +314,10 @@ AsyncAccessManager::notify_waiters (void) } catch (const CORBA::Exception& ex) { - ex._tao_print_exception ("AsyncAccessManager::notify_waiters"); + if (ImR_Locator_i::debug () > 1) + { + ex._tao_print_exception ("AsyncAccessManager::notify_waiters"); + } } } this->rh_list_.clear (); diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp index ae722a566f6..a7443d5e356 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp @@ -117,7 +117,9 @@ ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr acti catch (const CORBA::Exception& ex) { if (debug_ > 1) - ex._tao_print_exception ("ImR Activator: Can't register with ImR."); + { + ex._tao_print_exception ("ImR Activator: Can't register with ImR."); + } } if (debug_ > 0) diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index a18135b3bfb..2591c93ed92 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -313,8 +313,7 @@ ImR_Locator_i::shutdown ++shutdown_errs; if (debug_ > 1) { - ex._tao_print_exception ( - ACE_TEXT ("(%P|%t) ImR: shutdown activator")); + ex._tao_print_exception (ACE_TEXT ("(%P|%t) ImR: shutdown activator")); } } } @@ -716,8 +715,10 @@ ImR_Locator_i::set_timeout_policy (CORBA::Object_ptr obj, const ACE_Time_Value& } catch (const CORBA::Exception& ex) { - ex._tao_print_exception ( - ACE_TEXT ("(%P|%t) ImR_Locator_i::set_timeout_policy ()")); + if (debug_ > 0) + { + ex._tao_print_exception (ACE_TEXT ("(%P|%t) ImR_Locator_i::set_timeout_policy ()")); + } } return ret._retn (); diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp index 80795493a74..e8b59432392 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp @@ -952,9 +952,7 @@ TAO_IMR_Op_Autostart::run (void) } catch (const CORBA::Exception& ex) { - ex._tao_print_exception ( - server_list[i].server.in ( - )); + ex._tao_print_exception (server_list[i].server.in ()); // Ignore exception } } |