Fix NPE error when MySQLComStmtExecuteExecutor and MySQLComFieldListP…

…acketExecutor executing close (#33826)
apache · Dec 5, 2024 · 55eaa39 · 55eaa39
1 parent 74ea914
commit 55eaa39
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...sphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java b/...sphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java
@@ -126,6 +126,8 @@ private BinaryRow createBinaryRow(final QueryResponseRow queryResponseRow) {
 
     @Override
     public void close() throws SQLException {
-        proxyBackendHandler.close();
+        if (null != proxyBackendHandler) {
+            proxyBackendHandler.close();
+        }
     }
 }
diff --git a/...re/proxy/frontend/mysql/command/query/text/fieldlist/MySQLComFieldListPacketExecutor.java b/...re/proxy/frontend/mysql/command/query/text/fieldlist/MySQLComFieldListPacketExecutor.java
@@ -91,6 +91,8 @@ private Collection<DatabasePacket> createColumnDefinition41Packets(final String
 
     @Override
     public void close() throws SQLException {
-        databaseConnector.close();
+        if (null != databaseConnector) {
+            databaseConnector.close();
+        }
     }
 }