ChangeLogTag: Tue Aug 30 13:22:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

10 files changed, 50 insertions, 26 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index abb079e75b7..1d196d02fc6 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Tue Aug 30 13:22:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/PolicyS.cpp:
+          Regenerated this file and merged some of the changes caused by that,
+          especially the include order
+
 Tue Aug 30 12:35:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * TAO_IDL/util/utl_global.cpp:
diff --git a/TAO/tests/AMI_Timeouts/timeout_client.cpp b/TAO/tests/AMI_Timeouts/timeout_client.cpp
index 28f7cc360c9..96322b4cf1d 100644
--- a/TAO/tests/AMI_Timeouts/timeout_client.cpp
+++ b/TAO/tests/AMI_Timeouts/timeout_client.cpp
@@ -174,13 +174,14 @@ TimeoutClient::send (CORBA::Boolean async,
           timeoutObject_->sendc_sendTimeToWait (replyHandlerObject_.in (),
                                                 remote_sleep
                                                 ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK_EX (normal);
         }
       else // synch
         {
           timeoutObject_->sendTimeToWait (remote_sleep
                                           ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK_EX (normal);
         }
-      ACE_TRY_CHECK_EX (normal);
     }
   ACE_CATCH (CORBA::TIMEOUT, timeout)
     {
diff --git a/TAO/tests/Big_Oneways/Session.cpp b/TAO/tests/Big_Oneways/Session.cpp
index e94a3250a79..e6f77c212c6 100644
--- a/TAO/tests/Big_Oneways/Session.cpp
+++ b/TAO/tests/Big_Oneways/Session.cpp
@@ -114,7 +114,10 @@ Session::validate_connections (ACE_ENV_SINGLE_ARG_DECL)
               this->other_sessions_[j]->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
-          ACE_CATCHANY {} ACE_ENDTRY;
+          ACE_CATCHANY
+            {
+            }
+          ACE_ENDTRY;
         }
     }
 }
@@ -170,6 +173,7 @@ Session::start (const Test::Session_List &other_sessions
   }
 
   this->validate_connections (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
 
   this->barrier_.wait ();
 
diff --git a/TAO/tests/Bug_1476_Regression/Client_Task.cpp b/TAO/tests/Bug_1476_Regression/Client_Task.cpp
index 570c96f0935..7e153576cd6 100644
--- a/TAO/tests/Bug_1476_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1476_Regression/Client_Task.cpp
@@ -31,11 +31,11 @@ Client_Task::svc (void)
       // Apply sync_none policy
       CORBA::Object_var object =
         orb_->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      ACE_TRY_CHECK;
 
       CORBA::PolicyCurrent_var policy_current =
         CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (policy_current.in ()))
         {
@@ -50,13 +50,13 @@ Client_Task::svc (void)
         orb_->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                             scope_as_any
                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      ACE_TRY_CHECK;
       policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE
                                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      ACE_TRY_CHECK;
 
       policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      ACE_TRY_CHECK;
 
       for (int i = 0; i != number_; ++i)
         {
diff --git a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
index 5c8ebd4db32..1d3676af938 100644
--- a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
+++ b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
@@ -37,6 +37,7 @@ Reply_Handler::next_prime_excep (
       ACE_TRY_CHECK;
 
       this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/Faults/ping.cpp b/TAO/tests/Faults/ping.cpp
index d8eed8882c6..d113c4a8a84 100644
--- a/TAO/tests/Faults/ping.cpp
+++ b/TAO/tests/Faults/ping.cpp
@@ -65,6 +65,8 @@ main (int argc, char *argv[])
       policies[0] =
         root_poa->create_lifespan_policy(PortableServer::PERSISTENT
                                          ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
       policies[1] =
         root_poa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION
                                                     ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/tests/Faults/test_i.cpp b/TAO/tests/Faults/test_i.cpp
index 19723c5b301..3d01593e5db 100644
--- a/TAO/tests/Faults/test_i.cpp
+++ b/TAO/tests/Faults/test_i.cpp
@@ -29,6 +29,8 @@ Callback_i::shutdown (CORBA::Boolean is_clean
       return;
     }
   this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
   ACE_DEBUG ((LM_DEBUG, "Shutdown: Performed clean shutdown\n"));
 }
 
diff --git a/TAO/tests/InterOp-Naming/Server_i.cpp b/TAO/tests/InterOp-Naming/Server_i.cpp
index ca9fd0c5c32..ec60caff7ea 100644
--- a/TAO/tests/InterOp-Naming/Server_i.cpp
+++ b/TAO/tests/InterOp-Naming/Server_i.cpp
@@ -106,17 +106,18 @@ Server_i::init (int argc,
 {
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create a child POA under the root POA.
-  if (this->orb_manager_.init_child_poa (argc,
-                                         argv,
-                                         "child_poa"
-                                         ACE_ENV_ARG_PARAMETER) == -1)
+  int result = this->orb_manager_.init_child_poa (argc,
+                                                  argv,
+                                                  "child_poa"
+                                                  ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (-1);
+
+  if (result == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
                       -1);
 
-  ACE_CHECK_RETURN (-1);
-
   this->argc_ = argc;
   this->argv_ = argv;
 
@@ -171,11 +172,13 @@ int
 Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Run the main event loop for the ORB.
-  if (this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER) == -1)
+  int result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (-1);
+
+  if (result == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Server_i::run"),
                       -1);
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/Param_Test/except.cpp b/TAO/tests/Param_Test/except.cpp
index b2ee727d323..959d2459c07 100644
--- a/TAO/tests/Param_Test/except.cpp
+++ b/TAO/tests/Param_Test/except.cpp
@@ -22,8 +22,8 @@
 
 #include "tao/DynamicInterface/Unknown_User_Exception.h"
 
-ACE_RCSID (Param_Test, 
-           except, 
+ACE_RCSID (Param_Test,
+           except,
            "$Id$")
 
 // ************************************************************************
@@ -72,12 +72,14 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req
 
       CORBA::NamedValue_ptr o2 =
         req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      ACE_TRY_CHECK;
+
       *o2->value () >>= this->inout_;
 
       CORBA::NamedValue_ptr o3 =
         req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      ACE_TRY_CHECK;
+
       *o3->value () >>= this->out_;
     }
   ACE_CATCH (CORBA::UnknownUserException, user_ex)
diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp
index d72a3003a37..c66e703967f 100644
--- a/TAO/tests/Param_Test/server.cpp
+++ b/TAO/tests/Param_Test/server.cpp
@@ -19,8 +19,8 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Param_Test, 
-           server, 
+ACE_RCSID (Param_Test,
+           server,
            "$Id$")
 
 // Parses the command line arguments and returns an error status.
@@ -95,9 +95,12 @@ main (int argc, char *argv[])
       policies[0] =
         oa_ptr->create_id_assignment_policy (PortableServer::USER_ID
                                              ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
       policies[1] =
         oa_ptr->create_lifespan_policy (PortableServer::PERSISTENT
                                         ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
       // We use a different POA, otherwise the user would have to
       // change the object key each time it invokes the server.
@@ -141,8 +144,8 @@ main (int argc, char *argv[])
 
       if (TAO_debug_level > 0)
         {
-          ACE_DEBUG ((LM_DEBUG, 
-                      "(%P|%t) The IOR is <%s>\n", 
+          ACE_DEBUG ((LM_DEBUG,
+                      "(%P|%t) The IOR is <%s>\n",
                       str.in ()));
         }
 
@@ -152,12 +155,12 @@ main (int argc, char *argv[])
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to open %s for writing: %p\n",
-                             ior_output_filename), 
+                             ior_output_filename),
                             -1);
         }
 
-      ACE_OS::fprintf (ior_output_file, 
-                       "%s", 
+      ACE_OS::fprintf (ior_output_file,
+                       "%s",
                        str.in ());
       ACE_OS::fclose (ior_output_file);