From 7b16169f85c1a0a0c81b13dd52ea4663cdf4ba55 Mon Sep 17 00:00:00 2001
From: Ruud Overeem <overeem@astron.nl>
Date: Thu, 23 Aug 2007 23:17:34 +0000
Subject: [PATCH] BugID: 1000 Bugfix in dpeSet call. The 'setted' WFA was never
called.
---
MAC/GCF/_PAL/SAL/src/GCF_PVSSInfo.cc | 2 --
MAC/GCF/_PAL/SAL/src/GSA_Service.cc | 6 ++++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/MAC/GCF/_PAL/SAL/src/GCF_PVSSInfo.cc b/MAC/GCF/_PAL/SAL/src/GCF_PVSSInfo.cc
index 9e2d9c5a7ab..9bdbe47a518 100644
--- a/MAC/GCF/_PAL/SAL/src/GCF_PVSSInfo.cc
+++ b/MAC/GCF/_PAL/SAL/src/GCF_PVSSInfo.cc
@@ -143,7 +143,6 @@ TMACValueType GCFPVSSInfo::getMACTypeId (const string& dpeName)
if ((Manager::getId(pvssDpeName, dpId) == PVSS_TRUE) &&
(Manager::getTypeContainerPtr(sysNr)->getElementType(dpId, dpElType) == DpTypeContOK)) {
return(macValueTypes[dpElType]);
- }
}
return (NO_LPT);
}
@@ -311,7 +310,6 @@ TGCFResult GCFPVSSInfo::getTypeStruct(const string& typeName,
list<TPropertyInfo>& propInfos,
int8 sysNr)
{
- TGCFResult result(GCF_NO_ERROR);
propInfos.clear();
CharString pvssTypeName = typeName.c_str();
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_Service.cc b/MAC/GCF/_PAL/SAL/src/GSA_Service.cc
index 2e8515038f7..a46fd1358ac 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_Service.cc
+++ b/MAC/GCF/_PAL/SAL/src/GSA_Service.cc
@@ -177,7 +177,7 @@ void GSAService::handleHotLink(const DpMsgAnswer& answer, const GSAWaitForAnswer
(const char*)pvssTypeName, dpName.c_str()));
}
else {
- LOG_TRACE_FLOW(formatString("Value of '%s' has get", dpName.c_str()));
+ LOG_TRACE_FLOW(formatString("Value of '%s' was get", dpName.c_str()));
dpeValueGet(dpName, *pPropertyValue);
}
if (pPropertyValue)
@@ -198,6 +198,7 @@ void GSAService::handleHotLink(const DpMsgAnswer& answer, const GSAWaitForAnswer
break;
default:
+ LOG_TRACE_FLOW_STR("Event " << answer.isAnswerOn() << " unhandled");
handled = false;
break;
}
@@ -209,6 +210,7 @@ void GSAService::handleHotLink(const DpMsgAnswer& answer, const GSAWaitForAnswer
if (pGrItem->wasOk() == PVSS_TRUE) {
if (answer.isAnswerOn() == DP_MSG_COMPLEX_VC) {
// this must be the answer on a dpSet(Wait)
+ LOG_TRACE_FLOW_STR("dpe " << wait.getDpName() << " was set");
dpeValueSet(wait.getDpName());
handled = true;
}
@@ -709,7 +711,7 @@ TSAResult GSAService::dpeSet(const string& dpeName,
GSAWaitForAnswer* pWFA(0);
if (wantAnswer) {
// Note: pWFA will be deleted by PVSS API
- GSAWaitForAnswer *pWFA = new GSAWaitForAnswer(*this);
+ pWFA = new GSAWaitForAnswer(*this);
pWFA->setDpName(dpeName);
}
PVSSboolean retVal, retValTS(PVSS_TRUE);
--
GitLab