Commit ce76f3ea authored by lilin's avatar lilin
Browse files

1 Modify judgment order 

2 before delete check entity exist
parent 05a5a413

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UdfFuncService.java

+12 −7
Original line number Diff line number Diff line
@@ -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);