[incubator-skywalking] branch fix-concurrency updated: Fixed not combine error in persistence register worker.

[pe...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

pengys pushed a commit to branch fix-concurrency
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git


The following commit(s) were added to refs/heads/fix-concurrency by this push:
     new 34c76a3  Fixed not combine error in persistence register worker.
34c76a3 is described below

commit 34c76a3127dcbe57725c5bab7fc5a77ffc7aac26
Author: peng-yongsheng <pe...@apache.org>
AuthorDate: Wed Oct 31 22:09:35 2018 +0800

    Fixed not combine error in persistence register worker.
---
 .../oap/server/core/register/worker/RegisterPersistentWorker.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/worker/RegisterPersistentWorker.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/worker/RegisterPersistentWorker.java
index dc6a6a7..57c663d 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/worker/RegisterPersistentWorker.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/worker/RegisterPersistentWorker.java
@@ -22,7 +22,7 @@ import java.util.*;
 import org.apache.skywalking.apm.commons.datacarrier.DataCarrier;
 import org.apache.skywalking.apm.commons.datacarrier.consumer.IConsumer;
 import org.apache.skywalking.oap.server.core.analysis.data.EndOfBatchContext;
-import org.apache.skywalking.oap.server.core.register.*;
+import org.apache.skywalking.oap.server.core.register.RegisterSource;
 import org.apache.skywalking.oap.server.core.source.Scope;
 import org.apache.skywalking.oap.server.core.storage.*;
 import org.apache.skywalking.oap.server.core.worker.AbstractWorker;
@@ -63,6 +63,8 @@ public class RegisterPersistentWorker extends AbstractWorker<RegisterSource> {
     private void onWork(RegisterSource registerSource) {
         if (!sources.containsKey(registerSource)) {
             sources.put(registerSource, registerSource);
+        } else {
+            sources.get(registerSource).combine(registerSource);
         }
 
         if (registerSource.getEndOfBatchContext().isEndOfBatch()) {