|
|
@ -178,11 +178,15 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC |
|
|
if (nodes != null) { |
|
|
if (nodes != null) { |
|
|
for (RuleNode node : nodes) { |
|
|
for (RuleNode node : nodes) { |
|
|
setSingletonMode(node); |
|
|
setSingletonMode(node); |
|
|
|
|
|
/* TODO: voba - merge comment |
|
|
if (node.getId() != null) { |
|
|
if (node.getId() != null) { |
|
|
ruleNodeIndexMap.put(node.getId(), nodes.indexOf(node)); |
|
|
ruleNodeIndexMap.put(node.getId(), nodes.indexOf(node)); |
|
|
} else { |
|
|
} else { |
|
|
toAddOrUpdate.add(node); |
|
|
toAddOrUpdate.add(node); |
|
|
} |
|
|
} |
|
|
|
|
|
*/ |
|
|
|
|
|
ruleNodeIndexMap.put(node.getId(), nodes.indexOf(node)); |
|
|
|
|
|
toAddOrUpdate.add(node); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -193,8 +197,8 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC |
|
|
Integer index = ruleNodeIndexMap.get(existingNode.getId()); |
|
|
Integer index = ruleNodeIndexMap.get(existingNode.getId()); |
|
|
RuleNode newRuleNode = null; |
|
|
RuleNode newRuleNode = null; |
|
|
if (index != null) { |
|
|
if (index != null) { |
|
|
newRuleNode = ruleChainMetaData.getNodes().get(index); |
|
|
// newRuleNode = ruleChainMetaData.getNodes().get(index);
|
|
|
toAddOrUpdate.add(newRuleNode); |
|
|
// toAddOrUpdate.add(newRuleNode);
|
|
|
} else { |
|
|
} else { |
|
|
updatedRuleNodes.add(new RuleNodeUpdateResult(existingNode, null)); |
|
|
updatedRuleNodes.add(new RuleNodeUpdateResult(existingNode, null)); |
|
|
toDelete.add(existingNode); |
|
|
toDelete.add(existingNode); |
|
|
|