From 9a02b25cdd00c5456cdd20a301282676c3af23e1 Mon Sep 17 00:00:00 2001
From: Ruud Overeem <overeem@astron.nl>
Date: Thu, 3 Aug 2006 09:15:45 +0000
Subject: [PATCH] BugID: 796 Bugfix
---
MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
index 53355f243b1..0eb9a1f5721 100644
--- a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
+++ b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
@@ -72,7 +72,7 @@ MACScheduler::MACScheduler() :
{
LOG_TRACE_OBJ ("MACscheduler construction");
- LOG_INFO_STR("MACProcessScope:" << globalParameterSet()->getString("prefix"));
+ LOG_INFO_STR("MACProcessScope: " << globalParameterSet()->getString("prefix"));
// Readin some parameters from the ParameterSet.
itsOTDBpollInterval = globalParameterSet()->getTime("OTDBpollInterval");
@@ -464,7 +464,8 @@ void MACScheduler::_doOTDBcheck()
treeID,
CNTLRTYPE_OBSERVATIONCTRL,
0, // instanceNr
- myHostname(true));
+ "rs001");
+// myHostname(true));
// Note: controller is now in state NO_STATE/CONNECTED (C/R)
// register this Observation
@@ -511,6 +512,7 @@ void MACScheduler::_addActiveObservation(const Observation& newObs)
if (iter->name == newObs.name) {
return;
}
+ iter++;
}
// update own admin and PVSS datapoint
@@ -538,6 +540,7 @@ void MACScheduler::_removeActiveObservation(const string& name)
itsObservations.erase(iter);
LOG_DEBUG_STR("Removed observation " << name << " from active observationList");
}
+ iter++;
}
if (!found) {
@@ -552,6 +555,7 @@ void MACScheduler::_removeActiveObservation(const string& name)
itsPVSSObsList.erase(pIter);
break;
}
+ pIter++;
}
itsPropertySet->setValue(PN_MS_ACTIVE_OBSERVATIONS, GCFPVDynArr(LPT_STRING, itsPVSSObsList));
}
--
GitLab