diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp index 20000a62737..025fd468294 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp @@ -18,7 +18,7 @@ TAO_Notify_SequencePushSupplier::~TAO_Notify_SequencePushSupplier () } void -TAO_Notify_SequencePushSupplier::init (CosNotifyComm::SequencePushSupplier_ptr push_supplier ACE_ENV_ARG_DECL_NOT_USED) +TAO_Notify_SequencePushSupplier::init (CosNotifyComm::SequencePushSupplier_ptr push_supplier) { // TODO: verify single init call // push_supplier is optional @@ -38,17 +38,15 @@ TAO_Notify_SequencePushSupplier::get_ior (void) const { ACE_CString result; CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb(); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { - CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in() ACE_ENV_ARG_PARAMETER); + CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in()); result = static_cast<const char*> (ior.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { result.fast_clear(); } - ACE_ENDTRY; return result; } |