Commit d91e0155 authored by lilin's avatar lilin
Browse files

1when queue or queName is null,return info param is null 

2 update queue may NPE
parent 47940d64

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

+14 −4
Original line number Diff line number Diff line
@@ -115,12 +115,12 @@ public class QueueService extends BaseService { 
        }



        if (StringUtils.isEmpty(queue)) {

            putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, queue);

            putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, "queue");

            return result;

        }



        if (StringUtils.isEmpty(queueName)) {

            putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, queueName);

            putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, "queueName");

            return result;

        }
@@ -163,6 +163,16 @@ public class QueueService extends BaseService { 
            return result;

        }



        if (StringUtils.isEmpty(queue)) {

            putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, "queue");

            return result;

        }



        if (StringUtils.isEmpty(queueName)) {

            putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, "queueName");

            return result;

        }



        Queue queueObj = queueMapper.selectById(id);

        if (queueObj == null) {

            putMsg(result, Status.QUEUE_NOT_EXIST, id);
@@ -222,12 +232,12 @@ public class QueueService extends BaseService { 
        Result result = new Result();



        if (StringUtils.isEmpty(queue)) {

            putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, queue);

            putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, "queue");

            return result;

        }



        if (StringUtils.isEmpty(queueName)) {

            putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, queueName);

            putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, "queueName");

            return result;

        }