diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2007-03-14 16:25:33 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2007-03-14 16:25:33 +0000 |
| commit | 69a3ab5f476d13a7da8f75d02f5d788028d17dbf (patch) | |
| tree | 5b962b373dc849f7a2de52928c82f646570f3cd4 | |
| parent | 3eebb3ca52ecc5efc429094a443a29d2d7cb3fad (diff) | |
| download | ATCD-69a3ab5f476d13a7da8f75d02f5d788028d17dbf.tar.gz | |
ChangeLogTag: Wed Mar 14 17:24:57 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 13 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp | 7 |
3 files changed, 21 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6f1e67c7e80..8f0c5494bcb 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,16 @@ +Wed Mar 14 17:24:57 UTC 2007 Chad Elliott <elliott_c@ociweb.com> + + * orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp: + + Modified this test to use explicit activation to support + CORBA e compact. + + * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp: + + Used explicit activation in one place, however there are more + places where implicit activation is used in this test and in the + Event core library. + Wed Mar 14 16:14:31 UTC 2007 Chad Elliott <elliott_c@ociweb.com> * orbsvcs/tests/Bug_2800_Regression/client.cpp: diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp index 98b7b344376..641920ea2f1 100644 --- a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp +++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp @@ -98,7 +98,8 @@ main(int argc, char * argv[]) time_servant); // Get a reference after activating the object - TimeModule::Time_var tm = time_servant->_this(); + CORBA::Object_var object = poa->id_to_reference (ServerId.in ()); + TimeModule::Time_var tm = TimeModule::Time::_narrow (object.in ()); // Get reference to initial naming context CORBA::Object_var name_obj = diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp index a5a21dad5b4..e89ab07ba61 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp @@ -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 ()); |