ChangeLogTag: Thu Jul 13 02:50:26 2000 Irfan Pyarali <irfan@cs.wustl.edu>

2 files changed, 9 insertions, 17 deletions

diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
index 0635c3d29ab..2829565260b 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
@@ -827,14 +827,10 @@ ImplRepo_i::init (int argc, char **argv, CORBA::Environment &ACE_TRY_ENV)
                       IMR_Adapter_Activator (this->forwarder_impl_),
                       -1);
 
-      PortableServer::AdapterActivator_var activator =
-        this->activator_->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
       // Register the Adapter_Activator reference to be the RootPOA's
       // Adapter Activator.
 
-      this->root_poa_->the_activator (activator.in (), ACE_TRY_ENV);
+      this->root_poa_->the_activator (this->activator_, ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // Get reactor instance from TAO.
@@ -1029,7 +1025,7 @@ ImplRepo_i::~ImplRepo_i (void)
                   "Implementation Repository: cannot remove handler\n"));
 
   delete this->forwarder_impl_;
-  delete this->activator_;
+  CORBA::release (this->activator_);
   delete this->ior_multicast_;
 }
 
@@ -1306,12 +1302,8 @@ IMR_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
           ACE_TRY_CHECK;
         }
 
-      exception_message = "While _this";
-      PortableServer::AdapterActivator_var activator = this->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
       exception_message = "While child->the_activator";
-      child->the_activator (activator.in (), ACE_TRY_ENV);
+      child->the_activator (this, ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       exception_message = "While unknown_adapter, set_servant";
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h
index ec5c17a1680..a2d39050705 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h
@@ -34,7 +34,7 @@ class IMR_Forwarder;
 typedef ImplRepo_i *ImplRepo_i_ptr;
 typedef ImplRepo_i_ptr ImplRepo_i_ref;
 
-class IMR_Adapter_Activator : public POA_PortableServer::AdapterActivator
+class IMR_Adapter_Activator : public PortableServer::AdapterActivator
 {
   // = TITLE
   //    Implementation Repository Adapter Activator
@@ -59,7 +59,7 @@ private:
   // The object to use as the default servant.
 };
 
-class ImplRepo_i 
+class ImplRepo_i
 : public POA_ImplementationRepository::Administration,
   public TAO_IOR_LookupTable_Callback
 {
@@ -161,8 +161,8 @@ private:
     ACE_THROW_SPEC ((CORBA::SystemException,
                      ImplementationRepository::Administration::NotFound,
                      ImplementationRepository::Administration::CannotActivate));
-  // Implementation of activate_server.  <check_startup> is a flag to check 
-  // the activation mode before attempting to start it.  
+  // Implementation of activate_server.  <check_startup> is a flag to check
+  // the activation mode before attempting to start it.
 
   void start_server_i (const char *server,
                        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
@@ -201,7 +201,7 @@ private:
   // The ior_multicast event handler.
 
   CORBA::String_var imr_ior_;
-  // Implementation Repository's IOR.  Why do we store it here?  Multicast 
+  // Implementation Repository's IOR.  Why do we store it here?  Multicast
   // doesn't work otherwise.
 
   int argc_;
@@ -209,7 +209,7 @@ private:
 
   char **argv_;
   // The command line arguments.
-  
+
   friend class IMR_Forwarder;
 };