diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/ruleset.c | 6 | ||||
| -rw-r--r-- | runtime/wti.h | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/runtime/ruleset.c b/runtime/ruleset.c index 822150d9..2e8d1f0f 100644 --- a/runtime/ruleset.c +++ b/runtime/ruleset.c @@ -165,11 +165,7 @@ finalize_it: static void execAct(struct cnfstmt *stmt, msg_t *pMsg, wti_t *pWti) { -// TODO: check here if bPrevWasSuspsended was required and, if so -// if we actually are permitted to execute this action. -// NOTE: this will primarily be handled by end-of-batch processing - - if(getActionState(pWti, stmt->d.act) == ACT_STATE_DIED) { + if(stmt->d.act->bDisabled) { DBGPRINTF("action %d died, do NOT execute\n", stmt->d.act->iActionNbr); goto done; } diff --git a/runtime/wti.h b/runtime/wti.h index 2a408c0a..57c2bfea 100644 --- a/runtime/wti.h +++ b/runtime/wti.h @@ -34,7 +34,6 @@ #define ACT_STATE_COMM 2 /* transaction finished (a transient state) */ #define ACT_STATE_RTRY 3 /* failure occured, trying to restablish ready state */ #define ACT_STATE_SUSP 4 /* suspended due to failure (return fail until timeout expired) */ -#define ACT_STATE_DIED 7 /* action permanently failed and now disabled */ /* note: 3 bit bit field --> highest value is 7! */ /* The following structure defines immutable parameters which need to |