diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-22 02:08:43 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-22 02:08:43 +0000 |
| commit | 17db3dd7feeed5750aed3b168a1960f073ddb55b (patch) | |
| tree | 5bc767d86b9f6d4e8970a2525e6bb6f6c505ac14 | |
| parent | b0cc2015bd44f2c0a17028e15b021e7d94093871 (diff) | |
| download | ATCD-17db3dd7feeed5750aed3b168a1960f073ddb55b.tar.gz | |
Fri May 21 20:58:05 1999 Irfan Pyarali <irfan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-99c | 6 | ||||
| -rw-r--r-- | TAO/examples/Simple/Simple_util.cpp | 22 |
2 files changed, 15 insertions, 13 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index afd457a496f..9e194f2bb4b 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,4 +1,8 @@ -Fri May 21 20:50:54 1999 Irfan Pyarali <irfan@cs.wustl.edu> +Fri May 21 20:58:05 1999 Irfan Pyarali <irfan@cs.wustl.edu> + + * examples/Simple/Simple_util.cpp (test_for_ins): Removed + unnecessary bank dependencies that Vishal had added to this + generic code. * tao/Connect.cpp (svc): * tao/ORB_Core.cpp (inherit_from_parent_thread): diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp index fad492a05b9..4dcc6bafa13 100644 --- a/TAO/examples/Simple/Simple_util.cpp +++ b/TAO/examples/Simple/Simple_util.cpp @@ -7,9 +7,9 @@ template <class Servant> Server<Servant>::Server (void) - : ior_output_file_ (0), - naming_ (0), - ins_ (0) + : ior_output_file_ (0), + naming_ (0), + ins_ (0) { // no-op. } @@ -73,20 +73,20 @@ template <class Servant> int Server<Servant>::test_for_ins (CORBA::String_var ior) { - CORBA::Object_ptr bank_servant = - this->orb_manager_.orb ()->string_to_object (ior.in()); + CORBA::Object_ptr object = + this->orb_manager_.orb ()->string_to_object (ior.in ()); // Add a KEY:IOR mapping to the ORB table. - ACE_CString object_id (this->ins_); + ACE_CString ins (this->ins_); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Adding (KEY:IOR) %s:%s\n", - object_id.c_str (), + ins.c_str (), ior.in ())); - if (this->orb_manager_.orb ()->_tao_add_to_IOR_table (object_id, - bank_servant) != 0) + if (this->orb_manager_.orb ()->_tao_add_to_IOR_table (ins, + object) != 0) ACE_ERROR_RETURN ((LM_ERROR, "Simple_Util : Unable to add IOR to table\n"), -1); @@ -346,8 +346,6 @@ Client<InterfaceObj, Var>::init (const char *name, if (this->parse_args () == -1) return -1; - - if(this->ior_ != 0) { CORBA::Object_var server_object = @@ -423,7 +421,7 @@ Client<InterfaceObj, Var>::obtain_initial_references (CORBA::Environment &ACE_TR } ACE_CATCHANY { - ACE_TRY_ENV.print_exception ("Bank::obtain_initial_references"); + ACE_TRY_ENV.print_exception ("Client::obtain_initial_references"); return -1; } ACE_ENDTRY; |