(shardingsphere) branch master updated: Fix NPE error when MySQLComStmtExecuteExecutor and MySQLComFieldListPacketExecutor executing close (#33826)

[jianglongtao]

This is an automated email from the ASF dual-hosted git repository.

jianglongtao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new 55eaa397f0f Fix NPE error when MySQLComStmtExecuteExecutor and 
MySQLComFieldListPacketExecutor executing close (#33826)
55eaa397f0f is described below

commit 55eaa397f0fae8f3f35e7d994e7b8b3d0db5e5b8
Author: jiangML <1060319...@qq.com>
AuthorDate: Thu Dec 5 10:48:06 2024 +0800

    Fix NPE error when MySQLComStmtExecuteExecutor and 
MySQLComFieldListPacketExecutor executing close (#33826)
---
 .../command/query/binary/execute/MySQLComStmtExecuteExecutor.java     | 4 +++-
 .../command/query/text/fieldlist/MySQLComFieldListPacketExecutor.java | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git 
a/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java
 
b/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java
index 108b58dca01..b25e8cf9544 100644
--- 
a/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java
+++ 
b/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java
@@ -126,6 +126,8 @@ public final class MySQLComStmtExecuteExecutor implements 
QueryCommandExecutor {
     
     @Override
     public void close() throws SQLException {
-        proxyBackendHandler.close();
+        if (null != proxyBackendHandler) {
+            proxyBackendHandler.close();
+        }
     }
 }
diff --git 
a/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/fieldlist/MySQLComFieldListPacketExecutor.java
 
b/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/fieldlist/MySQLComFieldListPacketExecutor.java
index 994411cc713..e7ffdbf1a34 100644
--- 
a/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/fieldlist/MySQLComFieldListPacketExecutor.java
+++ 
b/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/fieldlist/MySQLComFieldListPacketExecutor.java
@@ -91,6 +91,8 @@ public final class MySQLComFieldListPacketExecutor implements 
CommandExecutor {
     
     @Override
     public void close() throws SQLException {
-        databaseConnector.close();
+        if (null != databaseConnector) {
+            databaseConnector.close();
+        }
     }
 }