From ce76f3eab763e944a8a8149a5babbc90a085b215 Mon Sep 17 00:00:00 2001
From: lilin <samz406@foxmail.com>
Date: Fri, 27 Dec 2019 18:11:48 +0800
Subject: [PATCH] 1 Modify judgment order 2 before delete check entity exist

---
 .../api/service/UdfFuncService.java           | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UdfFuncService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UdfFuncService.java
index 8694f4e7b3..7b4ce63e24 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UdfFuncService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UdfFuncService.java
@@ -187,6 +187,12 @@ public class UdfFuncService extends BaseService{
         // verify udfFunc is exist
         UdfFunc udf = udfFuncMapper.selectUdfById(udfFuncId);
 
+        if (udf == null) {
+            result.put(Constants.STATUS, Status.UDF_FUNCTION_NOT_EXIST);
+            result.put(Constants.MSG, Status.UDF_FUNCTION_NOT_EXIST.getMsg());
+            return result;
+        }
+
         // if resource upload startup
         if (!PropertyUtils.getResUploadStartupState()){
             logger.error("resource upload startup state: {}", PropertyUtils.getResUploadStartupState());
@@ -194,12 +200,6 @@ public class UdfFuncService extends BaseService{
             return result;
         }
 
-        if (udf == null) {
-            result.put(Constants.STATUS, Status.UDF_FUNCTION_NOT_EXIST);
-            result.put(Constants.MSG, Status.UDF_FUNCTION_NOT_EXIST.getMsg());
-            return result;
-        }
-
         // verify udfFuncName is exist
         if (!funcName.equals(udf.getFuncName())) {
             if (checkUdfFuncNameExists(funcName)) {
@@ -303,7 +303,12 @@ public class UdfFuncService extends BaseService{
     @Transactional(rollbackFor = Exception.class)
     public Result delete(int id) {
         Result result = new Result();
-
+        //check exist
+        UdfFunc udfFunc = udfFuncMapper.selectById(id);
+        if (udfFunc == null) {
+            putMsg(result, Status.RESOURCE_NOT_EXIST);
+            return result;
+        }
         udfFuncMapper.deleteById(id);
         udfUserMapper.deleteByUdfFuncId(id);
         putMsg(result, Status.SUCCESS);