From 1fba73eea4530a95f0b206135da0217a0d62c50e Mon Sep 17 00:00:00 2001
From: Lei Zhang <27994433+SWJTU-ZhangLei@users.noreply.github.com>
Date: Mon, 15 Apr 2024 22:57:04 +0800
Subject: [PATCH] [fix](fe) Fix finalizeCommand `sendAndFlush`
 NullPointerException (#33420)

---
 .../org/apache/doris/qe/ConnectProcessor.java   | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java
index 34beb3c811..3c993179d7 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java
@@ -484,21 +484,16 @@ public abstract class ConnectProcessor {
             } else {
                 executor.sendResultSet(resultSet);
                 packet = getResultPacket();
-                if (packet == null) {
-                    if (LOG.isDebugEnabled()) {
-                        LOG.debug("packet == null");
-                    }
-                    return;
-                }
             }
         } else {
             packet = getResultPacket();
-            if (packet == null) {
-                if (LOG.isDebugEnabled()) {
-                    LOG.debug("packet == null");
-                }
-                return;
+        }
+
+        if (packet == null) {
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("packet == null");
             }
+            return;
         }
 
         MysqlChannel channel = ctx.getMysqlChannel();