diff options
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 534479978d6..3c10f5b5edc 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Thu Apr 4 13:35:46 UTC 2013 Byron Harris <harrisb@ociweb.com> + + * orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp: + + Avoid output containing "EXCEPTION" that triggers + test as a failure while allowing for retries in + the presence of exceptions due to timing issues. + Wed Apr 3 16:40:46 UTC 2013 Byron Harris <harrisb@ociweb.com> * orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp: diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp index cdae2a9eaf0..e5e0f6f9c29 100644 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp @@ -1796,9 +1796,11 @@ do_equivalence_name_test ( try { CORBA::Object_var obj1_on_replica = root_context_2->resolve (level1); } - catch (const CosNaming::NamingContext::NotFound& ex) + catch (const CosNaming::NamingContext::NotFound& ) { - ex._tao_print_exception ("INFO: Unable to resolve object from replica. Sleeping for a second.\n"); + ACE_DEBUG ((LM_INFO, + "INFO: Unable to resolve object from replica. " + "Sleeping for a second.\n")); ACE_OS::sleep (1); |