From 9371716838f0a3ca2687d876a8fa4d8131b3a9d9 Mon Sep 17 00:00:00 2001
From: pengys5 <8082209@qq.com>
Date: Sun, 10 Sep 2017 21:56:59 +0800
Subject: [PATCH] fixed data merge error

---
 .../org/skywalking/apm/collector/stream/worker/WorkerRefs.java  | 2 +-
 .../apm/collector/stream/worker/impl/PersistenceWorker.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/WorkerRefs.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/WorkerRefs.java
index 9f2f66f65c..3cbafe733f 100644
--- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/WorkerRefs.java
+++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/WorkerRefs.java
@@ -31,7 +31,7 @@ public class WorkerRefs<T extends WorkerRef> {
         logger.debug("WorkerSelector instance of {}", workerSelector.getClass());
         workerRefs.forEach(workerRef -> {
             if (workerRef instanceof RemoteWorkerRef) {
-                logger.info("message hashcode: {}, select workers: {}", message.hashCode(), workerRef.toString());
+                logger.debug("message hashcode: {}, select workers: {}", message.hashCode(), workerRef.toString());
             }
         });
         workerSelector.select(workerRefs, message).tell(message);
diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/PersistenceWorker.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/PersistenceWorker.java
index c1e509c200..a66086ca04 100644
--- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/PersistenceWorker.java
+++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/PersistenceWorker.java
@@ -122,7 +122,7 @@ public abstract class PersistenceWorker extends AbstractLocalAsyncWorker {
         Data data = (Data)message;
 
         if (dataCache.containsKey(data.id())) {
-            getRole().dataDefine().mergeData(data, dataCache.get(data.id()));
+            getRole().dataDefine().mergeData(dataCache.get(data.id()), data);
         } else {
             dataCache.put(data.id(), data);
         }
-- 
GitLab