[dolphinscheduler] branch 1.3.7-prepare updated: [1.3.7-prepare#5556][Bug][WorkerServer] SqlTask NPE (#5844)

[wenhemin]

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

wenhemin pushed a commit to branch 1.3.7-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/1.3.7-prepare by this push:
     new 368e01a  [1.3.7-prepare#5556][Bug][WorkerServer] SqlTask NPE (#5844)
368e01a is described below

commit 368e01a287a12f3217af6c8cc5d45d82776907bd
Author: Kirs <acm_mas...@163.com>
AuthorDate: Tue Jul 20 11:33:59 2021 +0800

    [1.3.7-prepare#5556][Bug][WorkerServer] SqlTask NPE (#5844)
    
    PR #5556
---
 .../dolphinscheduler/server/worker/task/sql/SqlTask.java    | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git 
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
 
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
index fa2940a..d410560 100644
--- 
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
+++ 
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
@@ -509,8 +509,16 @@ public class SqlTask extends AbstractTask {
             String paramName = m.group(1);
             Property prop =  paramsPropsMap.get(paramName);
 
+            if (prop == null) {
+                logger.error("setSqlParamsMap: No Property with paramName: {} 
is found in paramsPropsMap of task instance"
+                        + " with id: {}. So couldn't put Property in 
sqlParamsMap.", paramName, taskExecutionContext.getTaskInstanceId());
+            }
+            else {
             sqlParamsMap.put(index,prop);
             index ++;
+                logger.info("setSqlParamsMap: Property with paramName: {} put 
in sqlParamsMap of content {} successfully.", paramName, content);
+            }
+
         }
     }
 
@@ -525,9 +533,14 @@ public class SqlTask extends AbstractTask {
         //parameter print style
         logger.info("after replace sql , preparing : {}" , formatSql);
         StringBuilder logPrint = new StringBuilder("replaced sql , 
parameters:");
+        if (sqlParamsMap == null) {
+            logger.info("printReplacedSql: sqlParamsMap is null.");
+        }
+        else {
         for(int i=1;i<=sqlParamsMap.size();i++){
             
logPrint.append(sqlParamsMap.get(i).getValue()+"("+sqlParamsMap.get(i).getType()+")");
         }
+        }
         logger.info("Sql Params are {}", logPrint);
     }
 }