From 21ca9dc5b38e6f0674574f4d94dfb866a5700062 Mon Sep 17 00:00:00 2001
From: dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>
Date: Thu, 3 Nov 2005 21:38:07 +0000
Subject: Thu Nov 03 15:34:39 2005  Gan Deng  <gan.deng@vanderbilt.edu

---
 TAO/CIAO/ChangeLog                                           | 7 +++++++
 TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp | 3 ---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 8d15e69a8c9..adcd4deee29 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,10 @@
+Thu Nov 03 15:34:39 2005  Gan Deng  <gan.deng@vanderbilt.edu>
+
+	* DAnCE/NodeApplicationManager/ImplementationInfo.cpp
+
+	  Fixed a bug which causes unknow exception when calling
+	  startLaunch on NodeApplicationManager.
+
 Thu Nov  3 19:36:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * DAnCE/NodeManager/NodeManager_Impl.cpp:
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
index 40d3f0dfde9..5fc02fbb4ab 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
@@ -42,10 +42,7 @@ CIAO::NodeImplementationInfoHandler::populate_server_resource_def (void)
         {
           target_resource_id = 
             this->plan_.instance[i].deployedResource[0].resourceName.in ();
-        }
 
-      if (i != instance_len)
-        {
           // Some component instance has server resource usage defined, so we
           // set the <nodeapp_config> field of the NodeImplementationInfo struct.
           for (CORBA::ULong j = 0; j < this->plan_.infoProperty.length (); ++j)
-- 
cgit v1.2.1