Browse Source

transaction data init fix

pull/1301/head
Dima Landiak 8 years ago
parent
commit
ae42bb4fee
  1. 4
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbTransactionBeginNode.java
  2. 2
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbTransactionEndNode.java

4
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbTransactionBeginNode.java

@ -54,9 +54,9 @@ public class TbTransactionBeginNode implements TbNode {
@Override @Override
public void onMsg(TbContext ctx, TbMsg msg) throws ExecutionException, InterruptedException, TbNodeException { public void onMsg(TbContext ctx, TbMsg msg) throws ExecutionException, InterruptedException, TbNodeException {
log.trace("Msg in - [{}] [{}]", msg.getId(), msg.getType()); log.trace("Msg enters transaction - [{}] [{}]", msg.getId(), msg.getType());
TbMsgTransactionData transactionData = new TbMsgTransactionData(UUID.randomUUID(), msg.getOriginator()); TbMsgTransactionData transactionData = new TbMsgTransactionData(msg.getId(), msg.getOriginator());
TbMsg tbMsg = new TbMsg(msg.getId(), msg.getType(), msg.getOriginator(), msg.getMetaData(), TbMsgDataType.JSON, TbMsg tbMsg = new TbMsg(msg.getId(), msg.getType(), msg.getOriginator(), msg.getMetaData(), TbMsgDataType.JSON,
msg.getData(), transactionData, msg.getRuleChainId(), msg.getRuleNodeId(), msg.getClusterPartition()); msg.getData(), transactionData, msg.getRuleChainId(), msg.getRuleNodeId(), msg.getClusterPartition());

2
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbTransactionEndNode.java

@ -56,7 +56,7 @@ public class TbTransactionEndNode implements TbNode {
if (!isFailed) { if (!isFailed) {
ctx.tellNext(msg, SUCCESS); ctx.tellNext(msg, SUCCESS);
} }
log.trace("Msg out - [{}] [{}]", msg.getId(), msg.getType()); log.trace("Msg left transaction - [{}] [{}]", msg.getId(), msg.getType());
} }
@Override @Override

Loading…
Cancel
Save