Commit 5e47b2b92653e51f908a29937ce1ba76e8776139
Committed by
Andrew Shvayka
Andrew Shvayka
1 parent
3a38ed8d
Fixes according code review
Showing
2 changed files
with
3 additions
and
3 deletions
| @@ -289,7 +289,7 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh | @@ -289,7 +289,7 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh | ||
| 289 | private void putToQueue(TopicPartitionInfo tpi, TbMsg msg, TbQueueCallback callbackWrapper, EntityId target) { | 289 | private void putToQueue(TopicPartitionInfo tpi, TbMsg msg, TbQueueCallback callbackWrapper, EntityId target) { |
| 290 | switch (target.getEntityType()) { | 290 | switch (target.getEntityType()) { |
| 291 | case RULE_NODE: | 291 | case RULE_NODE: |
| 292 | - putToQueue(tpi, msg.copyWithRuleNodeId(entityId, new RuleNodeId(target.getId())), callbackWrapper); | 292 | + putToQueue(tpi, msg.copyWithRuleNodeId(entityId, new RuleNodeId(target.getId()), UUID.randomUUID()), callbackWrapper); |
| 293 | break; | 293 | break; |
| 294 | case RULE_CHAIN: | 294 | case RULE_CHAIN: |
| 295 | putToQueue(tpi, msg.copyWithRuleChainId(new RuleChainId(target.getId()), UUID.randomUUID()), callbackWrapper); | 295 | putToQueue(tpi, msg.copyWithRuleChainId(new RuleChainId(target.getId()), UUID.randomUUID()), callbackWrapper); |
| @@ -202,8 +202,8 @@ public final class TbMsg implements Serializable { | @@ -202,8 +202,8 @@ public final class TbMsg implements Serializable { | ||
| 202 | return new TbMsg(this.queueName, msgId, this.ts, this.type, this.originator, this.metaData, this.dataType, this.data, ruleChainId, null, this.ruleNodeExecCounter.get(), callback); | 202 | return new TbMsg(this.queueName, msgId, this.ts, this.type, this.originator, this.metaData, this.dataType, this.data, ruleChainId, null, this.ruleNodeExecCounter.get(), callback); |
| 203 | } | 203 | } |
| 204 | 204 | ||
| 205 | - public TbMsg copyWithRuleNodeId(RuleChainId ruleChainId, RuleNodeId ruleNodeId) { | ||
| 206 | - return new TbMsg(this.queueName, UUID.randomUUID(), this.ts, this.type, this.originator, this.metaData, this.dataType, this.data, ruleChainId, ruleNodeId, this.ruleNodeExecCounter.get(), callback); | 205 | + public TbMsg copyWithRuleNodeId(RuleChainId ruleChainId, RuleNodeId ruleNodeId, UUID msgId) { |
| 206 | + return new TbMsg(this.queueName, msgId, this.ts, this.type, this.originator, this.metaData, this.dataType, this.data, ruleChainId, ruleNodeId, this.ruleNodeExecCounter.get(), callback); | ||
| 207 | } | 207 | } |
| 208 | 208 | ||
| 209 | public TbMsgCallback getCallback() { | 209 | public TbMsgCallback getCallback() { |