diff --git a/server/jsonrpc/jsontypes.cpp b/server/jsonrpc/jsontypes.cpp index d5ab21c0..f4ee7dba 100644 --- a/server/jsonrpc/jsontypes.cpp +++ b/server/jsonrpc/jsontypes.cpp @@ -496,13 +496,11 @@ QVariantMap JsonTypes::packRule(const Rule &rule) foreach (const Action &action, rule.actions()) { actionList.append(JsonTypes::packAction(action)); } - if (!rule.exitActions().isEmpty()) { - QVariantList exitActionList; - foreach (const Action &action, rule.exitActions()) { - exitActionList.append(JsonTypes::packAction(action)); - } - ruleMap.insert("exitActions", exitActionList); + QVariantList exitActionList; + foreach (const Action &action, rule.exitActions()) { + exitActionList.append(JsonTypes::packAction(action)); } + ruleMap.insert("exitActions", exitActionList); ruleMap.insert("actions", actionList); ruleMap.insert("stateEvaluator", JsonTypes::packStateEvaluator(rule.stateEvaluator())); diff --git a/tests/auto/rules/testrules.cpp b/tests/auto/rules/testrules.cpp index 832fa6ba..6bb73163 100644 --- a/tests/auto/rules/testrules.cpp +++ b/tests/auto/rules/testrules.cpp @@ -182,7 +182,7 @@ void TestRules::addRemoveRules_data() QTest::addColumn("name"); - QTest::newRow("valid rule. 1 EventDescriptor, StateEvaluator, 1 Action, enabled, name") << true << validActionNoParams << validEventDescriptor1 << QVariantList() << validStateEvaluator << RuleEngine::RuleErrorNoError << false << "TestRule"; + QTest::newRow("valid rule. 1 EventDescriptor, StateEvaluator, 1 Action, enabled, name") << true << validActionNoParams << validEventDescriptor1 << QVariantList() << validStateEvaluator << RuleEngine::RuleErrorNoError << true << "TestRule"; QTest::newRow("valid rule. 1 EventDescriptor, StateEvaluator, 1 Action, diabled, name") << false << validActionNoParams << validEventDescriptor1 << QVariantList() << validStateEvaluator << RuleEngine::RuleErrorNoError << false << "TestRule"; QTest::newRow("valid rule. 2 EventDescriptors, 1 Action, name") << true << validActionNoParams << QVariantMap() << eventDescriptorList << validStateEvaluator << RuleEngine::RuleErrorNoError << false << "TestRule"; QTest::newRow("invalid rule: eventDescriptor and eventDescriptorList used") << true << validActionNoParams << validEventDescriptor1 << eventDescriptorList << validStateEvaluator << RuleEngine::RuleErrorInvalidParameter << false << "TestRule";