Commit cd26ab20221fd28963246ea1e05100baac69a496
1 parent
8bfa8cc1
Exists in
master
Alteração de nome de método
Showing
5 changed files
with
7 additions
and
7 deletions
Show diff stats
cit-esi-api/src/main/java/br/com/centralit/esi/api/execution/model/ProcessInstance.java
... | ... | @@ -510,7 +510,7 @@ public class ProcessInstance extends PersistentObject implements Serializable { |
510 | 510 | return this.getException() != null; |
511 | 511 | } |
512 | 512 | |
513 | - public boolean hasError() { | |
513 | + public boolean isStoppedByError() { | |
514 | 514 | return this.hasErrorLog() && this.errorStatus != null && this.errorStatus; |
515 | 515 | } |
516 | 516 | ... | ... |
cit-esi-api/src/main/java/br/com/centralit/esi/api/execution/service/event/WorkItemErrorEndEventServiceImpl.java
... | ... | @@ -22,7 +22,7 @@ public class WorkItemErrorEndEventServiceImpl extends WorkItemServiceImpl<ErrorE |
22 | 22 | |
23 | 23 | @Override |
24 | 24 | protected WorkItem internalSolve(RuntimeEnvironment runtimeEnvironment, ProcessInstance processInstance, FlowElement flowElement) { |
25 | - if (processInstance.hasError()) { | |
25 | + if (processInstance.isStoppedByError()) { | |
26 | 26 | this.registerAndComplete(runtimeEnvironment, processInstance,flowElement); |
27 | 27 | this.completeProcessInstance(runtimeEnvironment, processInstance); |
28 | 28 | } | ... | ... |
cit-esi-api/src/main/java/br/com/centralit/esi/api/execution/service/event/WorkItemErrorIntermediateEventServiceImpl.java
... | ... | @@ -22,7 +22,7 @@ public class WorkItemErrorIntermediateEventServiceImpl extends WorkItemServiceIm |
22 | 22 | |
23 | 23 | @Override |
24 | 24 | protected WorkItem internalSolve(RuntimeEnvironment runtimeEnvironment, ProcessInstance processInstance, FlowElement flowElement) { |
25 | - if (processInstance.hasError()) { | |
25 | + if (processInstance.isStoppedByError()) { | |
26 | 26 | WorkItem workItem = this.registerAndComplete(runtimeEnvironment, processInstance,flowElement); |
27 | 27 | return retrieveTargets(runtimeEnvironment,workItem); |
28 | 28 | }else{ | ... | ... |
cit-esi-api/src/main/java/br/com/centralit/esi/api/execution/service/impl/ProcessInstanceServiceBaseImpl.java
... | ... | @@ -142,7 +142,7 @@ public abstract class ProcessInstanceServiceBaseImpl extends GenericServiceImpl< |
142 | 142 | |
143 | 143 | this.verifyOriginWorkItem(runtimeEnvironment, processInstance); |
144 | 144 | |
145 | - if (!processInstance.hasError() && processInstance.isSendCompletionNotification()) { | |
145 | + if (!processInstance.isStoppedByError() && processInstance.isSendCompletionNotification()) { | |
146 | 146 | this.addMessage(runtimeEnvironment, processInstance, processInstance.getCompletionTemplate(), this.getSubscribersUsers(processInstance), this.getSubscribersGroups(processInstance), null); |
147 | 147 | } |
148 | 148 | } |
... | ... | @@ -208,7 +208,7 @@ public abstract class ProcessInstanceServiceBaseImpl extends GenericServiceImpl< |
208 | 208 | this.intializeObjects(runtimeEnvironment, processInstance); |
209 | 209 | WorkItemService workItemService = runtimeContext.getWorkItemService(flowElement); |
210 | 210 | WorkItem workItem = workItemService.solve(runtimeEnvironment, processInstance, flowElement); |
211 | - if (!flowElement.stopExecutionOnError() && processInstance.hasError()) { | |
211 | + if (!flowElement.stopExecutionOnError() && processInstance.isStoppedByError()) { | |
212 | 212 | processInstance.clearErrorStatus(); |
213 | 213 | } |
214 | 214 | if (workItem != null && workItem.getTargets() != null) { |
... | ... | @@ -485,7 +485,7 @@ public abstract class ProcessInstanceServiceBaseImpl extends GenericServiceImpl< |
485 | 485 | |
486 | 486 | this.go(runtimeEnvironment, processInstance, elementoInicio); |
487 | 487 | |
488 | - if (!processInstance.hasError() && processInstance.isSendCreationNotification()) { | |
488 | + if (!processInstance.isStoppedByError() && processInstance.isSendCreationNotification()) { | |
489 | 489 | this.addMessage(runtimeEnvironment, processInstance, processInstance.getCreationTemplate(), this.getSubscribersUsers(processInstance), this.getSubscribersGroups(processInstance), null); |
490 | 490 | } |
491 | 491 | ... | ... |
cit-esi-api/src/main/java/br/com/centralit/esi/api/execution/service/impl/WorkItemServiceImpl.java
... | ... | @@ -109,7 +109,7 @@ public class WorkItemServiceImpl<E extends FlowElement> extends GenericServiceIm |
109 | 109 | |
110 | 110 | protected List<FlowElement> getTargetElements(RuntimeEnvironment runtimeEnvironment, ProcessInstance processInstance, WorkItem workItem) { |
111 | 111 | List<FlowElement> targets = new ArrayList<FlowElement>(); |
112 | - if (!processInstance.hasError() || !workItem.getFlowElement().stopExecutionOnError()) { | |
112 | + if (!processInstance.isStoppedByError() || !workItem.getFlowElement().stopExecutionOnError()) { | |
113 | 113 | List<FlowConnection> connections = this.getCompliedTargetConnections(runtimeEnvironment, this.getFlowElement(workItem), processInstance); |
114 | 114 | for (FlowConnection flowConnection : connections) { |
115 | 115 | this.flowConnectionService.executeAction(runtimeEnvironment, processInstance, flowConnection); | ... | ... |