[incubator-dolphinscheduler] branch dev updated: change datasource null check position (#1883)

[journey]

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

journey pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 78bfe91  change datasource null check position (#1883)
78bfe91 is described below

commit 78bfe918d002cbea06ac8430503bee62dc8fc67a
Author: Yelli <amarant...@my.com>
AuthorDate: Mon Feb 3 11:07:19 2020 +0800

    change datasource null check position (#1883)
---
 .../dolphinscheduler/server/worker/task/sql/SqlTask.java   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

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 a2f07c8..eba05a0 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
@@ -123,19 +123,21 @@ public class SqlTask extends AbstractTask {
         }
 
         dataSource= 
processDao.findDataSourceById(sqlParameters.getDatasource());
-        logger.info("datasource name : {} , type : {} , desc : {}  , user_id : 
{} , parameter : {}",
-                dataSource.getName(),
-                dataSource.getType(),
-                dataSource.getNote(),
-                dataSource.getUserId(),
-                dataSource.getConnectionParams());
 
+        // data source is null
         if (dataSource == null){
             logger.error("datasource not exists");
             exitStatusCode = -1;
             return;
         }
 
+        logger.info("datasource name : {} , type : {} , desc : {}  , user_id : 
{} , parameter : {}",
+                dataSource.getName(),
+                dataSource.getType(),
+                dataSource.getNote(),
+                dataSource.getUserId(),
+                dataSource.getConnectionParams());
+
         Connection con = null;
         List<String> createFuncs = null;
         try {