*** empty log message ***

1 files changed, 16 insertions, 13 deletions

diff --git a/TAO/tao/POAManager.i b/TAO/tao/POAManager.i
index b5f31b2ffda..43cd7d77d3a 100644
--- a/TAO/tao/POAManager.i
+++ b/TAO/tao/POAManager.i
@@ -5,14 +5,14 @@
 ACE_INLINE ACE_Lock &
 TAO_POA_Manager::lock (void)
 {
-  return *this->lock_;
+  return this->lock_;
 }
 
 ACE_INLINE void
 TAO_POA_Manager::activate (CORBA_Environment &ACE_TRY_ENV)
 {
   // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
 
   this->activate_i (ACE_TRY_ENV);
 }
@@ -24,7 +24,7 @@ TAO_POA_Manager::hold_requests (CORBA::Boolean wait_for_completion,
                                 CORBA_Environment &ACE_TRY_ENV)
 {
   // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
 
   this->hold_requests_i (wait_for_completion, ACE_TRY_ENV);
 }
@@ -34,7 +34,7 @@ TAO_POA_Manager::discard_requests (CORBA::Boolean wait_for_completion,
                                    CORBA_Environment &ACE_TRY_ENV)
 {
   // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
 
   this->discard_requests_i (wait_for_completion, ACE_TRY_ENV);
 }
@@ -45,23 +45,26 @@ TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects,
                              CORBA_Environment &ACE_TRY_ENV)
 {
   // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
 
   this->deactivate_i (etherealize_objects,
                       wait_for_completion,
                       ACE_TRY_ENV);
 }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-ACE_INLINE TAO_POA_Manager *
-TAO_POA_Manager::clone (void)
+ACE_INLINE PortableServer::POAManager::State
+TAO_POA_Manager::get_state_i (void)
 {
-  return new TAO_POA_Manager;
+  return this->state_;
 }
 
-ACE_INLINE void
-TAO_POA_Manager::destroy (void)
+ACE_INLINE PortableServer::POAManager::State
+TAO_POA_Manager::get_state (CORBA::Environment &ACE_TRY_ENV)
 {
-  delete this;
+  // Lock access to the POAManager for the duration of this transaction
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), this->state_, ACE_TRY_ENV);
+
+  return this->get_state_i ();
 }
+
+#endif /* TAO_HAS_MINIMUM_CORBA */