summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp')
-rw-r--r--TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index 94604b1bb1f..e89ab07ba61 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -43,7 +43,7 @@ ECM_Driver::run (int argc, char* argv[])
try
{
this->orb_ =
- CORBA::ORB_init (argc, argv, "");
+ CORBA::ORB_init (argc, argv);
CORBA::Object_var poa_object =
this->orb_->resolve_initial_references("RootPOA");
@@ -129,8 +129,13 @@ ECM_Driver::run (int argc, char* argv[])
TAO_EC_Event_Channel ec_impl (attr);
// Register Event_Service with the Naming Service.
+ PortableServer::ObjectId_var id =
+ root_poa->activate_object (&ec_impl);
+
+ CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
RtecEventChannelAdmin::EventChannel_var ec =
- ec_impl._this ();
+ RtecEventChannelAdmin::EventChannel::_narrow (object.in ());
CORBA::String_var str =
this->orb_->object_to_string (ec.in ());
@@ -704,7 +709,6 @@ ECM_Supplier::push (const RtecEventComm::EventSet& events)
void
ECM_Supplier::disconnect_push_supplier (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
// this->supplier_proxy_->disconnect_push_supplier ();
}
@@ -811,7 +815,6 @@ ECM_Consumer::close (void)
void
ECM_Consumer::push (const RtecEventComm::EventSet& events)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_hrtime_t arrival = ACE_OS::gethrtime ();
this->federation_->consumer_push (arrival, events);
@@ -819,7 +822,6 @@ ECM_Consumer::push (const RtecEventComm::EventSet& events)
void
ECM_Consumer::disconnect_push_consumer (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
}