*** empty log message ***

3 files changed, 25 insertions, 20 deletions

diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
index 8fcd4b4bf62..f61a306866d 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
@@ -1136,7 +1136,8 @@ get_outgoing_connections (const Deployment::DeploymentPlan &plan,
                   0);
 
   // For each component instance in the child plan ...
-  for (CORBA::ULong i = 0; i < plan.instance.length (); ++i)
+  CORBA::ULong number = plan.instance.length ();
+  for (CORBA::ULong i = 0; i < number; ++i)
   {
 
     if (t == Internal_Connections &&
@@ -1171,7 +1172,7 @@ get_outgoing_connections_i (const char * instname,
   else
     tmp_plan = this->old_plan_;
 
-  // Search for all the connections in the plan.
+  // Search for all the bindings in the plan.
   const CORBA::ULong total_length = tmp_plan.connection.length();
   for (CORBA::ULong i = 0; i < total_length; ++i)
     {
@@ -1217,26 +1218,25 @@ populate_connection_for_binding (
                           plan.instance[endpoint.instanceRef].name.in ()) != 0)
         continue;
 
-      // We are only interested in Facet and EventConsumer port kind
-      if (endpoint.kind == Deployment::Facet ||
-          endpoint.kind == Deployment::EventConsumer)
+      // We are only interested when we are the "client" of the endpoint objref
+      if (endpoint.kind == Deployment::EventPublisher ||
+          endpoint.kind == Deployment::EventEmitter ||
+          endpoint.kind == Deployment::SimplexReceptacle ||
+          endpoint.kind == Deployment::MultiplexReceptacle )
         {
-          // Obtain the source index, which is the opposite of the endpoint
-          CORBA::ULong s_index = (i + 1) % 2;
-
-          ACE_CString source_inst =
-            plan.instance[binding.internalEndpoint[s_index]
-              .instanceRef].name.in ();
+          // Obtain the index of the "real" endpoint which has an objref. It
+          // is the opposite side of myself.
+          CORBA::ULong e_index = (i + 1) % 2;
 
           ACE_CString source_port =
-            binding.internalEndpoint[s_index].portName.in ();
+            binding.internalEndpoint[i].portName.in ();
 
           ACE_CString endpoint_inst =
-            plan.instance[binding.internalEndpoint[i]
+            plan.instance[binding.internalEndpoint[e_index]
               .instanceRef].name.in ();
 
           ACE_CString endpoint_port =
-            binding.internalEndpoint[i].portName.in ();
+            binding.internalEndpoint[e_index].portName.in ();
 
           bool found = false;
 
@@ -1254,14 +1254,14 @@ populate_connection_for_binding (
                                   endpoint_port.c_str ()) == 0)
                 {
                   retv.length (len+1);
-                  retv[len].instanceName = source_inst.c_str ();
+                  retv[len].instanceName = instname;
                   retv[len].portName = source_port.c_str ();
                   retv[len].endpointInstanceName = endpoint_inst.c_str ();
                   retv[len].endpointPortName = endpoint_port.c_str ();
 
                   retv[len].endpoint =
                       CORBA::Object::_duplicate(curr_recv_conn.endpoint.in ());
-                  retv[len].kind = binding.internalEndpoint[s_index].kind;
+                  retv[len].kind = binding.internalEndpoint[i].kind;
 
                   ++len;
                   found = true;
diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
index 9319754dd84..98b911b3387 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
@@ -312,6 +312,11 @@ namespace CIAO
      * of the "providedReference" for the component instances in the
      * child deployment plan as Receiver side.
      * By default, we search in the new plan.
+     *
+     * If <is_getting_all_connections> is false, then we only
+     * search for "new connections" (valid for ReDaC case only).
+     * Otherwise, we will search for both new connections and those
+     * already existing connections.
      */
     Deployment::Connections *
     get_outgoing_connections (const Deployment::DeploymentPlan &plan,
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
index 22d14b1d2b2..61fd9971412 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
@@ -83,7 +83,7 @@ create_connections (ACE_ENV_SINGLE_ARG_DECL)
         this->node_manager_->set_all_facets (comp_name, facets);
       }
 
-    if (CIAO::debug_level () > 9)
+    if (CIAO::debug_level () > 20)
       {
         ACE_DEBUG ((LM_DEBUG,
                   "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
@@ -105,7 +105,7 @@ create_connections (ACE_ENV_SINGLE_ARG_DECL)
         this->node_manager_->set_all_consumers (comp_name, consumers);
       }
 
-    if (CIAO::debug_level () > 9)
+    if (CIAO::debug_level () > 20)
       {
         ACE_DEBUG ((LM_DEBUG,
                   "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
@@ -127,7 +127,7 @@ create_connections (ACE_ENV_SINGLE_ARG_DECL)
       Deployment::Connection & conn = retv[len];
       conn.instanceName = (*iter).ext_id_.c_str ();
       conn.portName = facets[i]->name ();
-      if (CIAO::debug_level () > 9)
+      if (CIAO::debug_level () > 20)
         {
           ACE_DEBUG ((LM_DEBUG,
                     "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
@@ -145,7 +145,7 @@ create_connections (ACE_ENV_SINGLE_ARG_DECL)
       Deployment::Connection & conn = retv[len];
       conn.instanceName = (*iter).ext_id_.c_str ();
       conn.portName = consumers[i]->name ();
-      if (CIAO::debug_level () > 9)
+      if (CIAO::debug_level () > 20)
         {
           ACE_DEBUG ((LM_DEBUG,
                     "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"