ChangeLogTag: Thu Sep 29 07:30:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

8 files changed, 20 insertions, 3 deletions

diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
index df029202c74..f8a6cd74d47 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
@@ -107,8 +107,10 @@ TAO_CEC_EventChannel::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   this->supplier_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
 
   this->consumer_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index 106274577a6..04d0c3f5299 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -352,11 +352,16 @@ TAO::SSLIOP::Connector::corbaloc_scan (const char *endpoint,
    //Create the corresponding profile
    TAO_Profile *ptmp = 0;
    if (ssl_only)
+     {
        ptmp = this->make_secure_profile (ACE_ENV_SINGLE_ARG_PARAMETER);
+       ACE_CHECK_RETURN (0);
+     }
    else
+     {
        ptmp = this->make_profile (ACE_ENV_SINGLE_ARG_PARAMETER);
+       ACE_CHECK_RETURN (0);
+     }
 
-   ACE_CHECK_RETURN (0);
    return ptmp;
 }
 
diff --git a/TAO/tests/Smart_Proxies/Benchmark/client.cpp b/TAO/tests/Smart_Proxies/Benchmark/client.cpp
index 5c1be5369f7..44b0573c343 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/client.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/client.cpp
@@ -156,6 +156,7 @@ main (int argc, char *argv[])
       Test_var server =
         Test::_narrow (object.in ()
                        ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -205,6 +206,7 @@ main (int argc, char *argv[])
       Test_var server1 =
         Test::_narrow (object.in ()
                        ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server1.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tests/Smart_Proxies/Benchmark/server.cpp b/TAO/tests/Smart_Proxies/Benchmark/server.cpp
index d880efe9aa9..ca2acbcbec2 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/server.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/server.cpp
@@ -139,6 +139,7 @@ main (int argc, char *argv[])
       CORBA::String_var ior =
         orb->object_to_string (Test_object.in ()
                                ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
diff --git a/TAO/tests/Smart_Proxies/On_Demand/server.cpp b/TAO/tests/Smart_Proxies/On_Demand/server.cpp
index 0822db42084..5f0ebde1ffa 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/server.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/server.cpp
@@ -117,6 +117,7 @@ main (int argc, char *argv[])
       CORBA::Object_var object =
         orb->resolve_initial_references ("RootPOA"
                                          ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (object.in ()
@@ -136,6 +137,7 @@ main (int argc, char *argv[])
       CORBA::String_var ior =
         orb->object_to_string (Test_object.in ()
                                ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
diff --git a/TAO/tests/Smart_Proxies/Policy/client.cpp b/TAO/tests/Smart_Proxies/Policy/client.cpp
index 520ffeaa5a3..6a0bb7ee459 100644
--- a/TAO/tests/Smart_Proxies/Policy/client.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/client.cpp
@@ -70,26 +70,29 @@ run_test (CORBA::ORB_ptr orb_ptr,
           object =
             orb->string_to_object (ior1
                                    ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
       else
         {
           object =
             orb->string_to_object (ior2
                                    ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
-      ACE_TRY_CHECK;
 
       Test_var server =
         Test::_narrow (object.in ()
                        ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
       if (CORBA::is_nil (server.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Object reference is nil\n"),
                           1);
 
       server->method (0);
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 
+      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Smart_Proxies/Policy/server.cpp b/TAO/tests/Smart_Proxies/Policy/server.cpp
index d5197ba8359..7e000c323d3 100644
--- a/TAO/tests/Smart_Proxies/Policy/server.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/server.cpp
@@ -137,6 +137,7 @@ main (int argc, char *argv[])
       CORBA::String_var ior =
         orb->object_to_string (Test_object.in ()
                                ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
diff --git a/TAO/tests/Smart_Proxies/server.cpp b/TAO/tests/Smart_Proxies/server.cpp
index 648b1b58fd7..0fc44b24f0f 100644
--- a/TAO/tests/Smart_Proxies/server.cpp
+++ b/TAO/tests/Smart_Proxies/server.cpp
@@ -137,6 +137,7 @@ main (int argc, char *argv[])
       CORBA::String_var ior =
         orb->object_to_string (Test_object.in ()
                                ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)