1 files changed, 6 insertions, 33 deletions

diff --git a/CIAO/DAnCE/NodeManager/NM_Monitor_Impl.cpp b/CIAO/DAnCE/NodeManager/NM_Monitor_Impl.cpp
index 5279508d584..e49f1e5535d 100644
--- a/CIAO/DAnCE/NodeManager/NM_Monitor_Impl.cpp
+++ b/CIAO/DAnCE/NodeManager/NM_Monitor_Impl.cpp
@@ -53,7 +53,7 @@ void Onl_Monitor_NM_Monitor_i::monitor_app_QoS (
 {
   //  ACE_DEBUG ((LM_DEBUG, "\t\nInside the monitor_app_QoS\n"));
 
-  for (CORBA::ULong i;i < plans.length ();i++)
+  for (CORBA::ULong i = 0;i < plans.length ();i++)
   {
     ::Deployment::DeploymentPlan plan = plans[i];
     auto_ptr<Deployment::Domain> domain =
@@ -65,9 +65,9 @@ void Onl_Monitor_NM_Monitor_i::monitor_app_QoS (
     key += domain->node[0].name.in ();
 
     ACE_DEBUG ((LM_DEBUG, "The key is %s\n", key.c_str ()));
-    
+
     CORBA::Object_var obj;
-    
+
     try {
 	   obj = node_manager_->get_NAM (key);
     }
@@ -76,7 +76,7 @@ void Onl_Monitor_NM_Monitor_i::monitor_app_QoS (
       ex._tao_print_exception ("(%P|%t) NM_Monitor_i::monitor_app_QoS ()\t\n");
       ACE_DEBUG ((LM_DEBUG, "TM_DAEMON::Does not have a Component in this Node"));
       continue;
-    } 
+    }
 
     try {
       Deployment::NodeApplicationManager_var nam =
@@ -107,45 +107,18 @@ void Onl_Monitor_NM_Monitor_i::monitor_app_QoS (
 ::Deployment::Domain * Onl_Monitor_NM_Monitor_i::get_resource_data (
     void)
 {
-  // Add your implementation here
-
   //  ACE_DEBUG ((LM_DEBUG, "Inside the get_resource_data\n"));
-  Deployment::Domain_var domainv;
-
-  // time stamp the call to measure overhead of monitoring ...
-
-  //  ACE_High_Res_Timer time;
-  //time.start ();
-
-  domainv = this->controller_->update_data_for_TM ();
+  Deployment::Domain_var domainv = this->controller_->update_data_for_TM ();
 
  // now get the qos data from each NAM
   domainv->node[0].qos_seq.length (this->qos_monitor_seq_.size ());
 
   for (unsigned int i = 0;i < qos_monitor_seq_.size ();i++)
   {
-    ::Deployment::QoSSpecifications_var qos_seq = 
+    ::Deployment::QoSSpecifications_var qos_seq =
 	    this->qos_monitor_seq_[i]->get_app_QoS ();
-    
-
     domainv->node[0].qos_seq[i] = (*qos_seq)[0];
   }
-
-  //  ACE_Time_Value tv;
-  //time.elapsed_time (tv);
-
-  //ACE_hrtime_t tm;
-  //time.elapsed_microseconds (tm);
-
-  //std::string file_prox = domainv->node[0].name.in ();
-
-  //file_prox += "_Tprox";
-
-  //std::ofstream out (file_prox.c_str (), ios::app);
-  //out << tv.msec () << std::endl;
-  //out << tm << std::endl;
-  //out.close ();
-
   return domainv._retn ();
 }