From b777c9b2c24c68810aa55c1db34aeb03b686844c Mon Sep 17 00:00:00 2001
From: Ruud Overeem <overeem@astron.nl>
Date: Mon, 5 Mar 2012 14:32:48 +0000
Subject: [PATCH] Task #1418: Fixed resultcheck of parent control. Was lost in
a merge conflict... :-(
---
MAC/APL/APLCommon/src/ParentControl.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/MAC/APL/APLCommon/src/ParentControl.cc b/MAC/APL/APLCommon/src/ParentControl.cc
index 4541be29f70..538726e7f49 100644
--- a/MAC/APL/APLCommon/src/ParentControl.cc
+++ b/MAC/APL/APLCommon/src/ParentControl.cc
@@ -532,7 +532,7 @@ bool ParentControl::_confirmState(uint16 signal,
return (true);
}
- if (result != CT_RESULT_NO_ERROR) { // error reaching a state?
+ if (F_ERR_NR(result) != 0) { // error reaching a state?
parent->failed = true; // report problem
LOG_INFO_STR(cntlrName << " DID NOT reach the " << cts.name(requestedState(signal)) << " state, error=" << result);
return (false);
--
GitLab