diff options
Diffstat (limited to 'TAO/examples/Simple/chat/Client_i.cpp')
| -rw-r--r-- | TAO/examples/Simple/chat/Client_i.cpp | 72 |
1 files changed, 37 insertions, 35 deletions
diff --git a/TAO/examples/Simple/chat/Client_i.cpp b/TAO/examples/Simple/chat/Client_i.cpp index 5283f6b1b29..7c9c9f74806 100644 --- a/TAO/examples/Simple/chat/Client_i.cpp +++ b/TAO/examples/Simple/chat/Client_i.cpp @@ -81,14 +81,16 @@ Client_i::init (int argc, char *argv[]) if (this->parse_args (argc, argv) == -1) return -1; - ACE_TRY_NEW_ENV + CORBA::Environment TAO_TRY_ENV; + + TAO_TRY { // Retrieve the ORB. this->orb_manager_.init (argc, argv, 0, - ACE_TRY_ENV); - ACE_TRY_CHECK; + TAO_TRY_ENV); + TAO_CHECK_ENV; CORBA::ORB_var orb = this->orb_manager_.orb (); @@ -104,8 +106,8 @@ Client_i::init (int argc, char *argv[]) CORBA::Object_var server_object = orb->string_to_object (this->ior_, - ACE_TRY_ENV); - ACE_TRY_CHECK; + TAO_TRY_ENV); + TAO_CHECK_ENV; if (CORBA::is_nil (server_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -114,16 +116,15 @@ Client_i::init (int argc, char *argv[]) -1); this->server_ = Broadcaster::_narrow (server_object.in (), - ACE_TRY_ENV); - ACE_TRY_CHECK; + TAO_TRY_ENV); + TAO_CHECK_ENV; } - ACE_CATCHANY + TAO_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "client_i::init\n"); + TAO_TRY_ENV.print_exception ("client_i::init\n"); return -1; } - ACE_ENDTRY; + TAO_ENDTRY; // Register our <Input_Handler> to handle STDIN events, which will // trigger the <handle_input> method to process these events. @@ -146,34 +147,34 @@ Client_i::run (void) "\n============= Simple Chat =================\n" "========== type 'quit' to exit ===========\n")); - ACE_TRY_NEW_ENV + CORBA::Environment TAO_TRY_ENV; + + TAO_TRY { - PortableServer::POAManager_var poa_manager = - this->orb_manager_.poa_manager (); - poa_manager->activate (ACE_TRY_ENV); - ACE_TRY_CHECK; + 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 (ACE_TRY_ENV); - ACE_TRY_CHECK; + this->receiver_i_._this (TAO_TRY_ENV); + TAO_CHECK_ENV; // Register ourselves with the server. server_->add (this->receiver_var_.in (), this->nickname_, - ACE_TRY_ENV); - ACE_TRY_CHECK; + TAO_TRY_ENV); + TAO_CHECK_ENV; // Run the ORB. - this->orb_manager_.run (ACE_TRY_ENV); - ACE_TRY_CHECK; + this->orb_manager_.run (TAO_TRY_ENV); + TAO_CHECK_ENV; } - ACE_CATCHANY + TAO_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Client_i::run ()"); + TAO_TRY_ENV.print_exception ("Client_i::run ()"); return -1; } - ACE_ENDTRY; + TAO_ENDTRY; return 0; } @@ -186,7 +187,9 @@ Client_i::handle_input (ACE_HANDLE) if (ACE_OS::fgets (buf, BUFSIZ, stdin) == 0) return 0; - ACE_TRY_NEW_ENV + CORBA::Environment TAO_TRY_ENV; + + TAO_TRY { // Check if the user wants to quit. if (ACE_OS::strncmp (buf, @@ -195,9 +198,9 @@ Client_i::handle_input (ACE_HANDLE) { // Remove ourselves from the server. this->server_->remove (this->receiver_var_.in ()); - this->receiver_i_.shutdown (ACE_TRY_ENV); + this->receiver_i_.shutdown (TAO_TRY_ENV); - ACE_TRY_CHECK; + TAO_CHECK_ENV; return 0; } @@ -205,16 +208,15 @@ Client_i::handle_input (ACE_HANDLE) // the server. this->server_->say (this->receiver_var_.in (), buf, - ACE_TRY_ENV); - ACE_TRY_CHECK; + TAO_TRY_ENV); + TAO_CHECK_ENV; } - ACE_CATCHANY + TAO_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Input_Handler::init"); + TAO_TRY_ENV.print_exception ("Input_Handler::init"); return -1; } - ACE_ENDTRY; + TAO_ENDTRY; return 0; } |