ChangeLogTag: Mon Aug 15 10:56:28 2005 J.T. Conklin <jtc@acorntoolworks.com>

8 files changed, 69 insertions, 58 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 4bfd3173c8e..285d11a7855 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,26 +1,47 @@
+Mon Aug 15 10:56:28 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am:
+	* orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am:
+	* orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am:
+	* orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am:
+	* orbsvcs/orbsvcs/Makefile.am:
+
+	  Regenerated.
+
+	* orbsvcs/orbsvcs/DsLogAdmin.mpc:
+
+	  Changed to inherit from utils.
+
+	* orbsvcs/orbsvcs/Log/LogMgr_i.cpp (init):
+
+	  Use TAO::Utils::PolicyList_Destroyer instead of plain
+	  CORBA::PolicyList and an explicit loop to destroy the policies.
+	  This ensures all policies will be destroyed if an exception is
+	  thrown.
+
 Mon Aug 15 16:25:23 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_visitor_component/component_cs.cpp:
         * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
         * TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp:
         * TAO_IDL/be/be_visitor_interface/tie_si.cpp:
-        
+
           Removed incorrect generation of '::' before CORBA::is_nil()
           and CORBA::release().
 
 Mon Aug 15 16:08:15 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_valuetype.cpp:
-        
+
           Removed incorrect generation of '::' before generation of
           CORBA::add_ref() and CORBA::remove_ref() declarations.
 
 Mon Aug 15 15:45:32 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_visitor_exception/exception_ch.cpp:
-        
+
           Modified changes in
-          
+
           Fri Aug 12 22:13:15 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
           slightly to omit the generation of the leading double colon
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am
index 0c8ffeef366..7002f9db442 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am
@@ -30,6 +30,7 @@ Basic_Logging_Service_SOURCES = \
 
 Basic_Logging_Service_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am
index b06ccace4af..c83768e1b3c 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am
@@ -43,6 +43,7 @@ Event_Logging_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am
index 0af1d983e19..84921cf5e5b 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am
@@ -37,6 +37,7 @@ Notify_Logging_Service_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsNotifyLogAdmin_Serv.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am
index a7d7f51f28b..7d5894dca7d 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am
@@ -35,6 +35,7 @@ RTEvent_Logging_Service_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEventLogAdmin.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \
diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
index db898712299..a343d2cccc5 100644
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
@@ -93,7 +93,7 @@ project(DsLogAdmin_Skel) : orbsvcslib, core, dslogadmin, portableserver {
 }
 
 
-project(DsLogAdmin_Serv) : orbsvcslib, core, dslogadmin_skel, dynamicany, etcl, svc_utils {
+project(DsLogAdmin_Serv) : orbsvcslib, core, dslogadmin_skel, dynamicany, etcl, utils, svc_utils {
   sharedname   = TAO_DsLogAdmin_Serv
   dynamicflags = TAO_LOG_SERV_BUILD_DLL
   tagchecks   += Log
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
index 98246802c91..a675bfcb94e 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
@@ -1,5 +1,6 @@
 #include "LogMgr_i.h"
 #include "ace/Dynamic_Service.h"
+#include "tao/Utils/PolicyList_Destroyer.h"
 #include "orbsvcs/Log/Hash_Persistence_Strategy.h"
 #include "orbsvcs/Log/LogStore.h"
 
@@ -31,69 +32,53 @@ TAO_LogMgr_i::init (CORBA::ORB_ptr orb,
     this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::PolicyList policies;
+  {
+    TAO::Utils::PolicyList_Destroyer policies(1);
 
+    // Create Factory POA
+    policies.length (1);
+    policies[0] =
+      this->poa_->create_lifespan_policy (PortableServer::PERSISTENT
+					  ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK;
 
-  // Create Factory POA
-  policies.length (1);
-  policies[0] =
-    this->poa_->create_lifespan_policy (PortableServer::PERSISTENT
-					ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->factory_poa_ = this->poa_->create_POA ("factory_POA",
+						 poa_manager.in (),
+						 policies
+						 ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK;
+  }
 
-  this->factory_poa_ = this->poa_->create_POA ("factory_POA",
-					       poa_manager.in (),
-					       policies
-					       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Creation of the new POA is over, so destroy the Policy_Ptr's.
-  for (CORBA::ULong i = 0;
-       i < policies.length ();
-       ++i)
-    {
-      CORBA::Policy_ptr policy = policies[i];
-      policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
 
+  {
+    TAO::Utils::PolicyList_Destroyer policies(2);
 
-  // Create Log POA
-  policies.length (2);
-  policies[0] =
-    this->poa_->create_lifespan_policy (PortableServer::PERSISTENT
-					ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    // Create Log POA
+    policies.length (2);
+    policies[0] =
+      this->poa_->create_lifespan_policy (PortableServer::PERSISTENT
+					  ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK;
 
-  policies[1] = 
-    this->poa_->create_id_assignment_policy (PortableServer::USER_ID
-					     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    policies[1] = 
+      this->poa_->create_id_assignment_policy (PortableServer::USER_ID
+					       ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK;
 
 #if (TAO_HAS_MINIMUM_POA == 0)
-  policies.length(3);
-  policies[2] = 
-    this->poa_->create_servant_retention_policy (PortableServer::RETAIN
-						 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-#endif
-
-  this->log_poa_ = this->factory_poa_->create_POA ("log_POA",
-						   poa_manager.in (),
-						   policies
+    policies.length(3);
+    policies[2] = 
+      this->poa_->create_servant_retention_policy (PortableServer::RETAIN
 						   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ACE_CHECK;
+#endif
 
-  // Creation of the new POA is over, so destroy the Policy_Ptr's.
-  for (CORBA::ULong j = 0;
-       j < policies.length ();
-       ++j)
-    {
-      CORBA::Policy_ptr policy = policies[j];
-      policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  
+    this->log_poa_ = this->factory_poa_->create_POA ("log_POA",
+						     poa_manager.in (),
+						     policies
+						     ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK;
+  }
 
   // Load Log Strategy
   TAO_Log_Persistence_Strategy* strategy_;
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am
index dc03561816a..f49beddad00 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Makefile.am
@@ -2947,6 +2947,7 @@ libTAO_DsLogAdmin_Serv_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_DsLogAdmin_Serv_la_LIBADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
   libTAO_Svc_Utils.la \
   libTAO_ETCL.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \