ChangeLogTag: Tue Aug 10 12:01:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>

2 files changed, 30 insertions, 30 deletions

diff --git a/TAO/tests/Bug_1476_Regression/Client_Task.cpp b/TAO/tests/Bug_1476_Regression/Client_Task.cpp
index e86a7b4afb8..d0ad90cebd2 100644
--- a/TAO/tests/Bug_1476_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1476_Regression/Client_Task.cpp
@@ -24,39 +24,39 @@ Client_Task::svc (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
-  // Apply sync_none policy
-  CORBA::Object_var object =
-    orb_->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      // Apply sync_none policy
+      CORBA::Object_var object =
+        orb_->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (-1);
 
-  CORBA::PolicyCurrent_var policy_current =
-    CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+      CORBA::PolicyCurrent_var policy_current =
+        CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (-1);
 
-  if (CORBA::is_nil (policy_current.in ()))
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR: Nil policy current\n"));
-      return 1;
-    }
-  CORBA::Any scope_as_any;
-  scope_as_any <<= Messaging::SYNC_NONE;
+      if (CORBA::is_nil (policy_current.in ()))
+        {
+          ACE_ERROR ((LM_ERROR, "ERROR: Nil policy current\n"));
+          return 1;
+        }
+      CORBA::Any scope_as_any;
+      scope_as_any <<= Messaging::SYNC_NONE;
 
-  CORBA::PolicyList policies (1); policies.length (1);
-  policies[0] =
-    orb_->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                        scope_as_any
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+      CORBA::PolicyList policies (1); policies.length (1);
+      policies[0] =
+        orb_->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
+                            scope_as_any
+                            ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (-1);
+      policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE
+                                            ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (-1);
 
-  policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+      policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (-1);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
       for (int i = 0; i != number_; ++i)
         {
           ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Bug_1476_Regression/Sender_i.h b/TAO/tests/Bug_1476_Regression/Sender_i.h
index 961fdbf0cb5..ecbc5383ce1 100644
--- a/TAO/tests/Bug_1476_Regression/Sender_i.h
+++ b/TAO/tests/Bug_1476_Regression/Sender_i.h
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
  **/
 // ===================================================================
 
@@ -44,7 +44,7 @@ public:
                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_ready_message (ACE_ENV_ARG_DECL)
+  virtual void send_ready_message (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ULong get_number_received (void) const;