Commit 8f52e7e7 authored by qiaozhanwei's avatar qiaozhanwei
Browse files

Merge remote-tracking branch 'remotes/upstream/branch-1.0.2' into branch-1.0.2

parents 362fb0e7 e689fb7b

escheduler-api/src/main/java/cn/escheduler/api/service/ExecutorService.java

+5 −3
Original line number Diff line number Diff line
@@ -178,10 +178,12 @@ public class ExecutorService extends BaseService{ 
        }



        ProcessDefinition processDefinition = processDao.findProcessDefineById(processInstance.getProcessDefinitionId());

        if(executeType != ExecuteType.STOP && executeType != ExecuteType.PAUSE){

            result = checkProcessDefinitionValid(processDefinition, processInstance.getProcessDefinitionId());

            if (result.get(Constants.STATUS) != Status.SUCCESS) {

                return result;

            }

        }



        checkResult = checkExecuteType(processInstance, executeType);

        Status status = (Status) checkResult.get(Constants.STATUS);