From ae42bb4feef308f7f42cd5809a70cc6c3e87b01a Mon Sep 17 00:00:00 2001
From: Dima Landiak <dlandiak@thingsboard.io>
Date: Tue, 4 Dec 2018 12:34:20 +0200
Subject: [PATCH] transaction data init fix

---
 .../rule/engine/transaction/TbTransactionBeginNode.java       | 4 ++--
 .../rule/engine/transaction/TbTransactionEndNode.java         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbTransactionBeginNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbTransactionBeginNode.java
index bad4585d6a..2452f71f5e 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbTransactionBeginNode.java
+++ b/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
     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,
                 msg.getData(), transactionData, msg.getRuleChainId(), msg.getRuleNodeId(), msg.getClusterPartition());
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbTransactionEndNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbTransactionEndNode.java
index 14d2e20728..dc6ce6e914 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbTransactionEndNode.java
+++ b/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) {
             ctx.tellNext(msg, SUCCESS);
         }
-        log.trace("Msg out - [{}] [{}]", msg.getId(), msg.getType());
+        log.trace("Msg left transaction - [{}] [{}]", msg.getId(), msg.getType());
     }
 
     @Override