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

1 files changed, 4 insertions, 6 deletions

diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp
index ec2d97c6bdf..01cf15a6596 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp
@@ -9,7 +9,7 @@
 
 extern const char* ONEWAY_ARG_TEST_STR;
 
-Foo_B_SimpleClientEngine::Foo_B_SimpleClientEngine(Foo_B_ptr obj, 
+Foo_B_SimpleClientEngine::Foo_B_SimpleClientEngine(Foo_B_ptr obj,
                                                    Callback_ptr callback,
                                                    unsigned client_id,
                                                    bool collocated)
@@ -27,9 +27,9 @@ Foo_B_SimpleClientEngine::~Foo_B_SimpleClientEngine()
 
 
 bool
-Foo_B_SimpleClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
+Foo_B_SimpleClientEngine::execute(void)
 {
-  // Make sure the connection is established before making  
+  // Make sure the connection is established before making
   // remote invocations.
   if (AppHelper::validate_connection (this->obj_.in ()) == false)
     {
@@ -51,7 +51,6 @@ Foo_B_SimpleClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
       }
 
     this->obj_->op7 (this->callback_.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
   }
   ACE_CATCH (FooException, ex)
   {
@@ -62,8 +61,7 @@ Foo_B_SimpleClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
   ACE_ENDTRY;
 
   // Tell the servant that this client is done.
-  this->obj_->done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  this->obj_->done();
 
   return check_validity;
 }