kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed data merge error

This commit is contained in:
pengys5 2017-09-10 21:56:59 +08:00
parent 75bed4998d
commit 9371716838
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/WorkerRefs.java
View File

@ -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);

2
apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/PersistenceWorker.java
View File

@ -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);
}