summaryrefslogtreecommitdiff
path: root/TAO/tests/Bug_1495_Regression/Client_Task.cpp
diff options
context:
space:
mode:
authorelliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2007-01-25 18:17:52 +0000
committerelliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2007-01-25 18:17:52 +0000
commit2ee7b7eed4c0cc10f4ec25b186b04202af01b565 (patch)
tree08a8a649c90559cf5b2228c1caad15515902613e /TAO/tests/Bug_1495_Regression/Client_Task.cpp
parentc979767a00db4ea1299af482033a68829cc16675 (diff)
downloadATCD-2ee7b7eed4c0cc10f4ec25b186b04202af01b565.tar.gz
ChangeLogTag: Thu Jan 25 17:39:59 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'TAO/tests/Bug_1495_Regression/Client_Task.cpp')
-rw-r--r--TAO/tests/Bug_1495_Regression/Client_Task.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/TAO/tests/Bug_1495_Regression/Client_Task.cpp b/TAO/tests/Bug_1495_Regression/Client_Task.cpp
index d4454dac1d2..b9584834a8c 100644
--- a/TAO/tests/Bug_1495_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1495_Regression/Client_Task.cpp
@@ -24,14 +24,13 @@ Client_Task::Client_Task (const char *input,
int
Client_Task::svc (void)
{
- ACE_TRY_NEW_ENV
+ try
{
CORBA::Object_var object =
- corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER);
+ corb_->string_to_object (input_);
Bug1495_Regression::Bug1495_var server =
- Bug1495_Regression::Bug1495::_narrow (object.in ()
- ACE_ENV_ARG_PARAMETER);
+ Bug1495_Regression::Bug1495::_narrow (object.in ());
if (CORBA::is_nil (server.in ()))
{
@@ -48,7 +47,7 @@ Client_Task::svc (void)
// call the thread_id function on the test object
CORBA::Long remote_thread_id;
- server->get_thread_id (remote_thread_id ACE_ENV_ARG_PARAMETER);
+ server->get_thread_id (remote_thread_id);
ACE_DEBUG ((LM_INFO,
"Remote thread ID was %i\n",
@@ -73,13 +72,11 @@ Client_Task::svc (void)
}
}
}
- ACE_CATCHANY
+ catch (const CORBA::Exception& ex)
{
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
- "Caught exception in client task:");
+ ex._tao_print_exception ("Caught exception in client task:");
return 1;
}
- ACE_ENDTRY;
return 0;
}