diff options
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp | 1 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp | 1 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp | 1 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp | 4 | ||||
| -rw-r--r-- | TAO/tests/Big_Twoways/client.cpp | 3 | ||||
| -rw-r--r-- | TAO/tests/Two_Objects/Object_Factory_i.cpp | 1 | ||||
| -rw-r--r-- | TAO/utils/catior/catior.cpp | 2 |
9 files changed, 19 insertions, 5 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp index 7cea0017648..4cb1ffbcadb 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp @@ -437,6 +437,7 @@ main (int argc, argv, 0 ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp index 22daafbeedb..968f5b55d21 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp @@ -476,11 +476,14 @@ main (int argc, while (!DISTRIBUTER::instance ()->done ()) { - if( orb->work_pending( ACE_ENV_SINGLE_ARG_PARAMETER ) ) + CORBA::Boolean wp = orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + + if (wp) { orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_TRY_CHECK; } } diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp index 25a28701ff3..1237f1dc5fe 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp @@ -387,6 +387,7 @@ main (int argc, argv, 0 ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp index f694ebb2ec8..6f9ac75ee53 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp @@ -137,7 +137,9 @@ Server::run (void) while( !done ) { - if ( orb->work_pending( ACE_ENV_SINGLE_ARG_PARAMETER ) ) + CORBA::Boolean wp = orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + if (wp) { orb->perform_work( ACE_ENV_SINGLE_ARG_PARAMETER ); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp index 359b843199e..486c16196c1 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp @@ -378,6 +378,7 @@ main (int argc, argv, 0 ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp index 7cd5ef06af6..c0a7894dbb4 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp @@ -430,6 +430,8 @@ main (int argc, argv, 0 ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); @@ -460,6 +462,8 @@ main (int argc, result = CLIENT::instance ()->init (argc, argv ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + if (result < 0) ACE_ERROR_RETURN ((LM_ERROR, "client::init failed\n"),1); diff --git a/TAO/tests/Big_Twoways/client.cpp b/TAO/tests/Big_Twoways/client.cpp index ed04da64896..48013a64c34 100644 --- a/TAO/tests/Big_Twoways/client.cpp +++ b/TAO/tests/Big_Twoways/client.cpp @@ -79,7 +79,7 @@ main (int argc, char *argv[]) 1); } - Peer *peer_impl; + Peer *peer_impl = 0; ACE_NEW_RETURN (peer_impl, Peer (orb.in ()), 1); @@ -87,6 +87,7 @@ main (int argc, char *argv[]) Test::Peer_var peer = peer_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/Two_Objects/Object_Factory_i.cpp b/TAO/tests/Two_Objects/Object_Factory_i.cpp index 023ccf9b40f..368c3aa94ed 100644 --- a/TAO/tests/Two_Objects/Object_Factory_i.cpp +++ b/TAO/tests/Two_Objects/Object_Factory_i.cpp @@ -48,6 +48,7 @@ Object_Factory_i::create_second (ACE_ENV_SINGLE_ARG_DECL) Two_Objects_Test::Second_var second = second_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (Two_Objects_Test::Second::_nil ()); return second._retn(); } diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp index 266db0413ee..edc5ec3e18e 100644 --- a/TAO/utils/catior/catior.cpp +++ b/TAO/utils/catior/catior.cpp @@ -1035,7 +1035,7 @@ void displayHex( TAO_InputCDR &str ) return; } - ACE_DEBUG (( LM_DEBUG," %s \n", theDescr.c_str())); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" %s \n"), theDescr.c_str())); } static CORBA::Boolean |