Wed Jan 24 14:00:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 8 insertions, 27 deletions

diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
index 05bc380156d..995fcf04e94 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
@@ -25,7 +25,6 @@ Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
               "Sender_StreamEndPoint::modify_QoS\n"));
 
   int result =  this->change_qos (new_qos, the_flows ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
 
   if (result != 0)
     return 0;
@@ -47,8 +46,7 @@ Sender_StreamEndPoint::get_callback (const char *,
                   TAO_Negotiator,
                   -1);
   AVStreams::Negotiator_var negotiator_obj =
-    negotiator->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    negotiator->_this ();
 
   this->set_negotiator (negotiator_obj.in ());
 
@@ -192,7 +190,7 @@ Sender::fill_qos (AVStreams::streamQoS &qos)
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
+Sender::bind_to_receiver (void)
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -203,12 +201,10 @@ Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Object_var receiver_mmdevice_obj =
     this->naming_client_->resolve (name
                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   this->receiver_mmdevice_ =
     AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -258,8 +254,7 @@ Sender::init (int argc,
                 "File opened successfully\n"));
 
   // Resolve the object reference of the receiver from the Naming Service.
-  result = this->bind_to_receiver (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  result = this->bind_to_receiver ();
 
   if (result != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -325,8 +320,7 @@ Sender::init (int argc,
     this->sender_mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->sender_mmdevice_->_this ();
 
   ACE_NEW_RETURN (this->streamctrl_,
                   TAO_StreamCtrl,
@@ -346,7 +340,6 @@ Sender::init (int argc,
                                   qos,
                                   flow_spec
                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   if (bind_result == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -358,7 +351,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (void)
 {
 
 
@@ -436,7 +429,6 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
                   // continue other orb requests.
                   TAO_AV_CORE::instance ()->orb ()->run (wait_time
                                                          ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
                 }
             }
 
@@ -477,7 +469,6 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
               this->streamctrl_->modify_QoS (qos,
                                              flow_spec
                                              ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
             }
 
         } // end while
@@ -486,12 +477,10 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
       AVStreams::flowSpec stop_spec;
       this->streamctrl_->destroy (stop_spec
                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Shut the orb down.
       TAO_AV_CORE::instance ()->orb ()->shutdown (0
                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
     }
   ACE_CATCHANY
@@ -520,33 +509,27 @@ main (int argc,
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA"
                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
         = PortableServer::POA::_narrow (obj.in ()
                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = root_poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       root_poa.in ()
                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Initialize the Sender.
       int result = 0;
       result = SENDER::instance ()->init (argc,
                                           argv
                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -554,8 +537,7 @@ main (int argc,
                           -1);
 
       // Start sending data.
-      result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = SENDER::instance ()->pace_data ();
     }
   ACE_CATCHANY
     {
@@ -564,7 +546,6 @@ main (int argc,
       return -1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   SENDER::close (); // Explicitly finalize the Unmanaged_Singleton.