Permalink
Browse files

Closes OOZIE-113 merge changes for OOZIE-101 to ActionEndXCommand

  • Loading branch information...
1 parent 1637058 commit c52c3652011f44f6b9b6ab33819be6167805e93f Angelo Kaichen Huang committed Jun 1, 2011
Showing with 5 additions and 4 deletions.
  1. +5 −4 core/src/main/java/org/apache/oozie/command/wf/ActionEndXCommand.java
@@ -140,17 +140,18 @@ protected Void execute() throws CommandException {
"End, name [{0}] type [{1}] status[{2}] external status [{3}] signal value [{4}]",
wfAction.getName(), wfAction.getType(), wfAction.getStatus(), wfAction.getExternalStatus(),
wfAction.getSignalValue());
- WorkflowInstance wfInstance = wfJob.getWorkflowInstance();
- DagELFunctions.setActionInfo(wfInstance, wfAction);
- wfJob.setWorkflowInstance(wfInstance);
- incrActionCounter(wfAction.getType(), 1);
Instrumentation.Cron cron = new Instrumentation.Cron();
cron.start();
executor.end(context, wfAction);
cron.stop();
addActionCron(wfAction.getType(), cron);
+ WorkflowInstance wfInstance = wfJob.getWorkflowInstance();
+ DagELFunctions.setActionInfo(wfInstance, wfAction);
+ wfJob.setWorkflowInstance(wfInstance);
+ incrActionCounter(wfAction.getType(), 1);
+
if (!context.isEnded()) {
LOG.warn(XLog.OPS, "Action Ended, ActionExecutor [{0}] must call setEndData()",
executor.getType());

0 comments on commit c52c365

Please sign in to comment.