fix judge NPE when worker not found (#4039)

cfb3379c · 静夜思朝颜 · wu-sheng · 3f2f75a6 · cfb3379c
隐藏空白更改
内联并排

Showing with 4 addition and 4 deletion

oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/RemoteServiceHandler.java ...ywalking/oap/server/core/remote/RemoteServiceHandler.java +4 -4

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