From ac5673f955d3c8d89d59310a71033169b7dda89b Mon Sep 17 00:00:00 2001
From: pengys5 <8082209@qq.com>
Date: Thu, 14 Sep 2017 00:13:40 +0800
Subject: [PATCH] Fixed the bug that application calls sum incorrect. Because
 of merge method return a non merged value .

---
 .../apm/collector/stream/worker/impl/AggregationWorker.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/AggregationWorker.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/AggregationWorker.java
index 255d070166..4b5d9720e6 100644
--- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/AggregationWorker.java
+++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/AggregationWorker.java
@@ -73,7 +73,7 @@ public abstract class AggregationWorker extends AbstractLocalAsyncWorker {
         Data data = (Data)message;
         dataCache.writing();
         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