Skip to content
Snippets Groups Projects
Commit 7b16169f authored by Ruud Overeem's avatar Ruud Overeem
Browse files

BugID: 1000

Bugfix in dpeSet call. The 'setted' WFA was never called.
parent f52c85dc
No related branches found
No related tags found
No related merge requests found
...@@ -143,7 +143,6 @@ TMACValueType GCFPVSSInfo::getMACTypeId (const string& dpeName) ...@@ -143,7 +143,6 @@ TMACValueType GCFPVSSInfo::getMACTypeId (const string& dpeName)
if ((Manager::getId(pvssDpeName, dpId) == PVSS_TRUE) && if ((Manager::getId(pvssDpeName, dpId) == PVSS_TRUE) &&
(Manager::getTypeContainerPtr(sysNr)->getElementType(dpId, dpElType) == DpTypeContOK)) { (Manager::getTypeContainerPtr(sysNr)->getElementType(dpId, dpElType) == DpTypeContOK)) {
return(macValueTypes[dpElType]); return(macValueTypes[dpElType]);
}
} }
return (NO_LPT); return (NO_LPT);
} }
...@@ -311,7 +310,6 @@ TGCFResult GCFPVSSInfo::getTypeStruct(const string& typeName, ...@@ -311,7 +310,6 @@ TGCFResult GCFPVSSInfo::getTypeStruct(const string& typeName,
list<TPropertyInfo>& propInfos, list<TPropertyInfo>& propInfos,
int8 sysNr) int8 sysNr)
{ {
TGCFResult result(GCF_NO_ERROR);
propInfos.clear(); propInfos.clear();
CharString pvssTypeName = typeName.c_str(); CharString pvssTypeName = typeName.c_str();
......
...@@ -177,7 +177,7 @@ void GSAService::handleHotLink(const DpMsgAnswer& answer, const GSAWaitForAnswer ...@@ -177,7 +177,7 @@ void GSAService::handleHotLink(const DpMsgAnswer& answer, const GSAWaitForAnswer
(const char*)pvssTypeName, dpName.c_str())); (const char*)pvssTypeName, dpName.c_str()));
} }
else { 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); dpeValueGet(dpName, *pPropertyValue);
} }
if (pPropertyValue) if (pPropertyValue)
...@@ -198,6 +198,7 @@ void GSAService::handleHotLink(const DpMsgAnswer& answer, const GSAWaitForAnswer ...@@ -198,6 +198,7 @@ void GSAService::handleHotLink(const DpMsgAnswer& answer, const GSAWaitForAnswer
break; break;
default: default:
LOG_TRACE_FLOW_STR("Event " << answer.isAnswerOn() << " unhandled");
handled = false; handled = false;
break; break;
} }
...@@ -209,6 +210,7 @@ void GSAService::handleHotLink(const DpMsgAnswer& answer, const GSAWaitForAnswer ...@@ -209,6 +210,7 @@ void GSAService::handleHotLink(const DpMsgAnswer& answer, const GSAWaitForAnswer
if (pGrItem->wasOk() == PVSS_TRUE) { if (pGrItem->wasOk() == PVSS_TRUE) {
if (answer.isAnswerOn() == DP_MSG_COMPLEX_VC) { if (answer.isAnswerOn() == DP_MSG_COMPLEX_VC) {
// this must be the answer on a dpSet(Wait) // this must be the answer on a dpSet(Wait)
LOG_TRACE_FLOW_STR("dpe " << wait.getDpName() << " was set");
dpeValueSet(wait.getDpName()); dpeValueSet(wait.getDpName());
handled = true; handled = true;
} }
...@@ -709,7 +711,7 @@ TSAResult GSAService::dpeSet(const string& dpeName, ...@@ -709,7 +711,7 @@ TSAResult GSAService::dpeSet(const string& dpeName,
GSAWaitForAnswer* pWFA(0); GSAWaitForAnswer* pWFA(0);
if (wantAnswer) { if (wantAnswer) {
// Note: pWFA will be deleted by PVSS API // Note: pWFA will be deleted by PVSS API
GSAWaitForAnswer *pWFA = new GSAWaitForAnswer(*this); pWFA = new GSAWaitForAnswer(*this);
pWFA->setDpName(dpeName); pWFA->setDpName(dpeName);
} }
PVSSboolean retVal, retValTS(PVSS_TRUE); PVSSboolean retVal, retValTS(PVSS_TRUE);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment