From 78bfe918d002cbea06ac8430503bee62dc8fc67a Mon Sep 17 00:00:00 2001
From: Yelli <amarantine@my.com>
Date: Mon, 3 Feb 2020 11:07:19 +0800
Subject: [PATCH] change datasource null check position (#1883)

---
 .../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 a2f07c8be..eba05a0d2 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 {
-- 
GitLab