diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-24 15:39:09 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-24 15:39:09 +0000 |
commit | c801f87e59c00f72bdeb5ce7bd0d276674665bac (patch) | |
tree | 70bff03d1cf156ecf05ee4c5c338d8ce423e64ee /TAO/orbsvcs/tests/FtRtEvent/supplier.cpp | |
parent | 98c0b37d4714ff774fc3ada8c9ee893c719af714 (diff) | |
download | ATCD-c801f87e59c00f72bdeb5ce7bd0d276674665bac.tar.gz |
Wed Jan 24 14:00:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/orbsvcs/tests/FtRtEvent/supplier.cpp')
-rw-r--r-- | TAO/orbsvcs/tests/FtRtEvent/supplier.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp index 9033f5b02c2..06ddb75bf7b 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp @@ -37,10 +37,8 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL) { CORBA::Object_var obj = orb->string_to_object(get_opt.opt_arg () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); channel = FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); } break; case 'n': @@ -73,19 +71,17 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL) CosNaming::NamingContext_var naming_context = resolve_init<CosNaming::NamingContext>(orb.in(), "NameService" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); channel = resolve<FtRtecEventChannelAdmin::EventChannel>(naming_context.in(), name ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); } if (use_gateway) { // use local gateway to communicate with FTRTEC ACE_AUTO_PTR_RESET (gateway, new TAO_FTRTEC::FTEC_Gateway(orb.in(), channel.in()), TAO_FTRTEC::FTEC_Gateway); - return gateway->_this(ACE_ENV_SINGLE_ARG_PARAMETER); + return gateway->_this(); } else return channel._retn(); @@ -98,12 +94,10 @@ int main(int argc, ACE_TCHAR** argv) ACE_TRY { orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var channel = get_event_channel(argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil(channel.in())) @@ -112,13 +106,10 @@ int main(int argc, ACE_TCHAR** argv) PortableServer::POA_var poa = resolve_init<PortableServer::POA>(orb.in(), "RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - PortableServer::POAManager_var mgr = poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + PortableServer::POAManager_var mgr = poa->the_POAManager(); - mgr->activate(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + mgr->activate(); PushSupplier_impl push_supplier(orb.in()); if (push_supplier.init(channel.in() ACE_ENV_ARG_PARAMETER) == -1) @@ -128,7 +119,7 @@ int main(int argc, ACE_TCHAR** argv) supplier = push_supplier._this(); - orb->run(ACE_ENV_SINGLE_ARG_PARAMETER); + orb->run(); } ACE_CATCHANY { @@ -136,7 +127,6 @@ int main(int argc, ACE_TCHAR** argv) } ACE_ENDTRY; - ACE_CHECK_RETURN(-1); return 0; } |