From cfb3379cd0e3c2afc721acf3c781fb49b2e4e03e Mon Sep 17 00:00:00 2001
From: mrproliu <741550557@qq.com>
Date: Tue, 10 Dec 2019 23:22:56 +0800
Subject: [PATCH] fix judge NPE when worker not found (#4039)

---
 .../oap/server/core/remote/RemoteServiceHandler.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/RemoteServiceHandler.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/RemoteServiceHandler.java
index 17d546e69..f8deaa20f 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/RemoteServiceHandler.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/RemoteServiceHandler.java
@@ -93,10 +93,10 @@ public class RemoteServiceHandler extends RemoteServiceGrpc.RemoteServiceImplBas
 
                     try {
                         RemoteHandleWorker handleWorker = workerInstanceGetter.get(nextWorkerName);
-                        AbstractWorker nextWorker = handleWorker.getWorker();
-                        StreamData streamData = handleWorker.getStreamDataClass().newInstance();
-                        streamData.deserialize(remoteData);
-                        if (nextWorker != null) {
+                        if (handleWorker != null) {
+                            AbstractWorker nextWorker = handleWorker.getWorker();
+                            StreamData streamData = handleWorker.getStreamDataClass().newInstance();
+                            streamData.deserialize(remoteData);
                             nextWorker.in(streamData);
                         } else {
                             remoteInTargetNotFoundCounter.inc();