diff options
Diffstat (limited to 'tests/NestedUpcall/Triangle_Test/initiator.cpp')
| -rw-r--r-- | tests/NestedUpcall/Triangle_Test/initiator.cpp | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/tests/NestedUpcall/Triangle_Test/initiator.cpp b/tests/NestedUpcall/Triangle_Test/initiator.cpp index 3433e5fea2a..3b7500c822c 100644 --- a/tests/NestedUpcall/Triangle_Test/initiator.cpp +++ b/tests/NestedUpcall/Triangle_Test/initiator.cpp @@ -1,21 +1,18 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/NestedUpCalls/Triangle_Test -// -// = FILENAME -// initiator.cpp -// -// = DESCRIPTION -// This class implements a simple server for the -// Nested Upcalls - Triangle test. -// -// = AUTHORS -// Michael Kircher -// -// ============================================================================ + +//============================================================================= +/** + * @file initiator.cpp + * + * $Id$ + * + * This class implements a simple server for the + * Nested Upcalls - Triangle test. + * + * + * @author Michael Kircher + */ +//============================================================================= + #include "initiator.h" #include "tao/debug.h" @@ -23,8 +20,6 @@ #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Triangle_Test, initiator, "$Id$") - Initiator_Server::Initiator_Server (void) : object_A_key_ (0), object_B_key_ (0), @@ -143,10 +138,11 @@ Initiator_Server::init (int argc, try { + CORBA::ORB_var orb = this->orb_manager_.orb(); // Get Object A CORBA::Object_var object_A_obj_var = - this->orb_manager_.orb()->string_to_object (this->object_A_key_); + orb->string_to_object (this->object_A_key_); this->object_A_var_ = Object_A::_narrow (object_A_obj_var.in()); @@ -168,7 +164,7 @@ Initiator_Server::init (int argc, // Get Object B CORBA::Object_var object_B_obj_var = - this->orb_manager_.orb()->string_to_object (this->object_B_key_); + orb->string_to_object (this->object_B_key_); this->object_B_var_ = Object_B::_narrow (object_B_obj_var.in()); @@ -255,6 +251,9 @@ Initiator_Server::~Initiator_Server (void) if (this->object_B_key_ != 0) ACE_Allocator::instance ()->free (this->object_B_key_); + this->object_A_var_->shutdown (); + this->object_B_var_->shutdown (); + try { this->orb_manager_.deactivate (this->str_.in ()); |