summaryrefslogtreecommitdiff
path: root/TAO/examples/Simple/chat/Client_i.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/examples/Simple/chat/Client_i.cpp')
-rw-r--r--TAO/examples/Simple/chat/Client_i.cpp23
1 files changed, 8 insertions, 15 deletions
diff --git a/TAO/examples/Simple/chat/Client_i.cpp b/TAO/examples/Simple/chat/Client_i.cpp
index 7c9c9f74806..a8bb90c667e 100644
--- a/TAO/examples/Simple/chat/Client_i.cpp
+++ b/TAO/examples/Simple/chat/Client_i.cpp
@@ -86,16 +86,14 @@ Client_i::init (int argc, char *argv[])
TAO_TRY
{
// Retrieve the ORB.
- this->orb_manager_.init (argc,
- argv,
- 0,
- TAO_TRY_ENV);
+ this->orb_ = CORBA::ORB_init (argc,
+ argv,
+ 0,
+ TAO_TRY_ENV);
TAO_CHECK_ENV;
- CORBA::ORB_var orb = this->orb_manager_.orb ();
-
// set the orb in the receiver_i_ object.
- this->receiver_i_.orb (orb.in ());
+ this->receiver_i_.orb (this->orb_.in ());
// read the ior from file
if (this->read_ior (this->ior_file_name_) != 0)
@@ -105,8 +103,8 @@ Client_i::init (int argc, char *argv[])
-1);
CORBA::Object_var server_object =
- orb->string_to_object (this->ior_,
- TAO_TRY_ENV);
+ this->orb_->string_to_object (this->ior_,
+ TAO_TRY_ENV);
TAO_CHECK_ENV;
if (CORBA::is_nil (server_object.in ()))
@@ -151,10 +149,6 @@ Client_i::run (void)
TAO_TRY
{
- PortableServer::POAManager_var poa_manager = this->orb_manager_.poa_manager ();
- poa_manager->activate (TAO_TRY_ENV);
- TAO_CHECK_ENV;
-
this->receiver_var_ =
this->receiver_i_._this (TAO_TRY_ENV);
TAO_CHECK_ENV;
@@ -166,8 +160,7 @@ Client_i::run (void)
TAO_CHECK_ENV;
// Run the ORB.
- this->orb_manager_.run (TAO_TRY_ENV);
- TAO_CHECK_ENV;
+ this->orb_->run ();
}
TAO_CATCHANY
{