inner-2062: fix npe

Signed-off-by: dcy10000 <[email protected]>
actiontech · Dec 27, 2022 · 8fa8ff8 · 8fa8ff8
1 parent 59e8fce
commit 8fa8ff8
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/java/com/actiontech/dble/services/BackendService.java b/src/main/java/com/actiontech/dble/services/BackendService.java
@@ -211,7 +211,7 @@ void parseErrorPacket(byte[] data, String reason) {
     @Override
     protected void handleInnerData(byte[] data) {
         if (connection.isClosed()) {
-            if (data.length > 4 && data[4] == ErrorPacket.FIELD_COUNT) {
+            if (data != null && data.length > 4 && data[4] == ErrorPacket.FIELD_COUNT) {
                 parseErrorPacket(data, "connection close");
             }
             return;
@@ -241,11 +241,11 @@ protected void handleDataError(Exception e) {
     }
 
     private void clearTaskQueue() {
-        while (!taskQueue.isEmpty()) {
-            final ServiceTask task = taskQueue.poll();
+        ServiceTask task;
+        while ((task = taskQueue.poll()) != null) {
             if (task.getType() == ServiceTaskType.NORMAL) {
                 final byte[] data = ((NormalServiceTask) task).getOrgData();
-                if (data.length > 4 && data[4] == ErrorPacket.FIELD_COUNT) {
+                if (data != null && data.length > 4 && data[4] == ErrorPacket.FIELD_COUNT) {
                     parseErrorPacket(data, "cleanup");
                 }
             }