Merge pull request #415 from wu-sheng/feature/aggbug

Fixed the bug that application calls sum incorrect.

Merge pull request #415 from wu-sheng/feature/aggbug
Fixed the bug that application calls sum incorrect.
1535fc5b · wu-sheng · GitHub · db57d8de · ac5673f9 · 1535fc5b
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/AggregationWorker.java ...g/apm/collector/stream/worker/impl/AggregationWorker.java +1 -1

未找到文件。
--- 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);
        }