diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp')
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp index 5c1140577f7..6ca9c897786 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp @@ -26,7 +26,7 @@ TAO_Notify_SequenceProxyPushSupplier::release (void) } void -TAO_Notify_SequenceProxyPushSupplier::connect_sequence_push_consumer (CosNotifyComm::SequencePushConsumer_ptr push_consumer ACE_ENV_ARG_DECL) +TAO_Notify_SequenceProxyPushSupplier::connect_sequence_push_consumer (CosNotifyComm::SequencePushConsumer_ptr push_consumer) ACE_THROW_SPEC (( CORBA::SystemException , CosEventChannelAdmin::AlreadyConnected @@ -39,9 +39,9 @@ TAO_Notify_SequenceProxyPushSupplier::connect_sequence_push_consumer (CosNotifyC TAO_Notify_SequencePushConsumer (this), CORBA::NO_MEMORY ()); - consumer->init (push_consumer ACE_ENV_ARG_PARAMETER); + consumer->init (push_consumer); - this->connect (consumer ACE_ENV_ARG_PARAMETER); + this->connect (consumer); this->self_change (); } @@ -80,22 +80,20 @@ TAO_Notify_SequenceProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& att if (attrs.load("PeerIOR", ior)) { CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb(); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CosNotifyComm::SequencePushConsumer_var pc = CosNotifyComm::SequencePushConsumer::_nil(); if (ior.length() > 0) { - CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER); - pc = CosNotifyComm::SequencePushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER); + CORBA::Object_var obj = orb->string_to_object(ior.c_str()); + pc = CosNotifyComm::SequencePushConsumer::_unchecked_narrow(obj.in()); } - this->connect_sequence_push_consumer(pc.in() ACE_ENV_ARG_PARAMETER); + this->connect_sequence_push_consumer(pc.in()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // if we can't reconnect, tough } - ACE_ENDTRY; } } |