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

duanzhengqiang 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 62e0ca302a1 Add database null checker for SQLCheckEngine (#23809)
62e0ca302a1 is described below

commit 62e0ca302a1331e49669d68d2aba113b13864094
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jan 29 21:42:19 2023 +0800

    Add database null checker for SQLCheckEngine (#23809)
---
 .../apache/shardingsphere/infra/executor/check/SQLCheckEngine.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/check/SQLCheckEngine.java
 
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/check/SQLCheckEngine.java
index 613b3af4b19..c329db1d996 100644
--- 
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/check/SQLCheckEngine.java
+++ 
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/check/SQLCheckEngine.java
@@ -51,7 +51,9 @@ public final class SQLCheckEngine {
     public static void check(final SQLStatementContext<?> sqlStatementContext, 
final List<Object> params,
                              final ShardingSphereRuleMetaData 
globalRuleMetaData, final ShardingSphereDatabase database, final Grantee 
grantee) {
         Collection<ShardingSphereRule> rules = new 
LinkedList<>(globalRuleMetaData.getRules());
-        rules.addAll(database.getRuleMetaData().getRules());
+        if (null != database) {
+            rules.addAll(database.getRuleMetaData().getRules());
+        }
         for (Entry<ShardingSphereRule, SQLChecker> entry : 
OrderedSPILoader.getServices(SQLChecker.class, rules).entrySet()) {
             entry.getValue().check(sqlStatementContext, params, grantee, 
globalRuleMetaData, database, entry.getKey());
         }

Reply via email to