Wed Nov 8 14:24:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

3 files changed, 15 insertions, 8 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 64f75f6ece5..18da3934344 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,9 +1,19 @@
+Wed Nov  8 14:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp:
+          Fixed a small memory leaks and other problems. This fixes bugzilla
+          2692. Thanks to Sowayan Abdullah <abdullah dot sowayan at lmco dot com>
+          for reporting these issues.
+
+        * DAnCE/NodeApplicationManager/ImplementationInfo.cpp:
+          A few small improvements
+
 Sun Nov  5 19:16:57 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
 
         * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
           Removed the use of STL iostream.
           Use ACE DLL decorator, prefix, suffix for DLL file names.
-          
+
         * DAnCE/RepositoryManager/PC_Updater.cpp:
         * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
         * DAnCE/RepositoryManager/RMadmin.cpp:
diff --git a/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp b/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
index 436715588c4..5cd0eb8dad9 100644
--- a/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
+++ b/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
@@ -30,11 +30,9 @@ CIAO::NodeImplementationInfoHandler::node_impl_info (void) const
 void
 CIAO::NodeImplementationInfoHandler::populate_server_resource_def (void)
 {
-  const CORBA::ULong instance_len = plan_.instance.length ();
+  CORBA::ULong const instance_len = plan_.instance.length ();
   const char * target_resource_id = 0;
 
-  CORBA::ULong i;
-
   // Iterate over the instance list to find whether any server resource
   // has been specified
   // TODO: We shoud do some sanity check here, since all the component
@@ -48,7 +46,7 @@ CIAO::NodeImplementationInfoHandler::populate_server_resource_def (void)
   // ServerResource file will be deployed in the same NA.  However,
   // those using different ServerResource files should be deployed to
   // different NAs.  Something to be fixed later.
-  for (i = 0; i < instance_len; ++i)
+  for (CORBA::ULong i = 0; i < instance_len; ++i)
     {
       if (this->plan_.instance[i].deployedResource.length () != 0)
         {
diff --git a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
index a74f5ee377e..5af350d275c 100644
--- a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
+++ b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
@@ -79,8 +79,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   NodeImplementationInfoHandler handler (plan, dummy);
 
-  Deployment::NodeImplementationInfo * node_impl_info =
-    handler.node_impl_info ();
+  Deployment::NodeImplementationInfo_var node_impl_info (handler.node_impl_info ());
 
   if (!node_impl_info)
     {
@@ -90,7 +89,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     }
 
-  Deployment::ContainerImplementationInfos& impl_infos = node_impl_info[0].impl_infos;
+  Deployment::ContainerImplementationInfos& impl_infos = node_impl_info->impl_infos;
 
   FILE* fp = ACE_OS::fopen ("plan.h", "w");