-
Notifications
You must be signed in to change notification settings - Fork 6.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
… (#4667) MNT-24405: task created on Activiti-5 is visible on Activiti-7 (#4657) (cherry picked from commit 98218e5)
- Loading branch information
Showing
2 changed files
with
94 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
90 changes: 90 additions & 0 deletions
90
...i-core/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/HandleFailedJobCmd.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| /* | ||
| * Copyright 2010-2020 Alfresco Software, Ltd. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.activiti.engine.impl.cmd; | ||
|
|
||
| import org.activiti.engine.ActivitiIllegalArgumentException; | ||
| import org.activiti.engine.JobNotFoundException; | ||
| import org.activiti.engine.delegate.event.ActivitiEventType; | ||
| import org.activiti.engine.delegate.event.impl.ActivitiEventBuilder; | ||
| import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl; | ||
| import org.activiti.engine.impl.interceptor.Command; | ||
| import org.activiti.engine.impl.interceptor.CommandConfig; | ||
| import org.activiti.engine.impl.interceptor.CommandContext; | ||
| import org.activiti.engine.impl.jobexecutor.FailedJobCommandFactory; | ||
| import org.activiti.engine.runtime.Job; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import java.io.Serializable; | ||
|
|
||
| public class HandleFailedJobCmd implements Command<Object>, Serializable { | ||
|
|
||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| private static Logger log = LoggerFactory.getLogger(HandleFailedJobCmd.class); | ||
|
|
||
| protected String jobId; | ||
| protected Throwable exception; | ||
| protected ProcessEngineConfigurationImpl processEngineConfiguration; | ||
|
|
||
| public HandleFailedJobCmd( | ||
| String jobId, | ||
| ProcessEngineConfigurationImpl processEngineConfiguration, | ||
| Throwable exception) { | ||
| this.jobId = jobId; | ||
| this.processEngineConfiguration = processEngineConfiguration; | ||
| this.exception = exception; | ||
| } | ||
|
|
||
| public Object execute(CommandContext commandContext) { | ||
| if (jobId == null) { | ||
| throw new ActivitiIllegalArgumentException("jobId and job is null"); | ||
| } | ||
|
|
||
| Job job = commandContext.getJobEntityManager().findById(jobId); | ||
|
|
||
| if (job == null) { | ||
| throw new JobNotFoundException(jobId); | ||
| } | ||
|
|
||
| if (log.isDebugEnabled()) { | ||
| log.debug("Executing job {}", job.getId()); | ||
| } | ||
|
|
||
| executeInternal(commandContext,job); | ||
| return null; | ||
| } | ||
|
|
||
| protected void executeInternal(CommandContext commandContext, Job job) { | ||
| CommandConfig commandConfig = processEngineConfiguration.getCommandExecutor().getDefaultConfig().transactionRequiresNew(); | ||
| FailedJobCommandFactory failedJobCommandFactory = commandContext.getFailedJobCommandFactory(); | ||
| Command<Object> cmd = failedJobCommandFactory.getCommand(job.getId(), exception); | ||
|
|
||
| log.trace("Using FailedJobCommandFactory '" + failedJobCommandFactory.getClass() + "' and command of type '" + cmd.getClass() + "'"); | ||
| processEngineConfiguration.getCommandExecutor().execute(commandConfig, cmd); | ||
|
|
||
| // Dispatch an event, indicating job execution failed in a | ||
| // try-catch block, to prevent the original exception to be swallowed | ||
| if (commandContext.getEventDispatcher().isEnabled()) { | ||
| try { | ||
| commandContext.getEventDispatcher().dispatchEvent(ActivitiEventBuilder.createEntityExceptionEvent(ActivitiEventType.JOB_EXECUTION_FAILURE, job, exception)); | ||
| } catch (Throwable ignore) { | ||
| log.warn("Exception occurred while dispatching job failure event, ignoring.", ignore); | ||
| } | ||
| } | ||
| } | ||
| } |