You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by mo...@apache.org on 2013/09/04 22:59:51 UTC

svn commit: r1520140 - in /oozie/trunk: core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java release-log.txt

Author: mona
Date: Wed Sep  4 20:59:51 2013
New Revision: 1520140

URL: http://svn.apache.org/r1520140
Log:
OOZIE-1513 Workflow stays in running if Fork/join validation or loop detection fails (mona)

Modified:
    oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java
    oozie/trunk/release-log.txt

Modified: oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java?rev=1520140&r1=1520139&r2=1520140&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java Wed Sep  4 20:59:51 2013
@@ -30,7 +30,6 @@ import org.apache.oozie.ErrorCode;
 import org.apache.oozie.XException;
 import org.apache.oozie.command.CommandException;
 import org.apache.oozie.command.PreconditionException;
-import org.apache.oozie.command.coord.CoordActionUpdateXCommand;
 import org.apache.oozie.command.wf.ActionXCommand.ActionExecutorContext;
 import org.apache.oozie.executor.jpa.BulkUpdateInsertJPAExecutor;
 import org.apache.oozie.executor.jpa.JPAExecutorException;
@@ -181,7 +180,7 @@ public class SignalXCommand extends Work
                 completed = workflowInstance.signal(wfAction.getExecutionPath(), wfAction.getSignalValue());
             }
             catch (WorkflowException e) {
-                throw new CommandException(e);
+                wfJob.setStatus(WorkflowJob.Status.valueOf(workflowInstance.getStatus().toString()));
             }
             wfJob.setWorkflowInstance(workflowInstance);
             wfAction.resetPending();

Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1520140&r1=1520139&r2=1520140&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Wed Sep  4 20:59:51 2013
@@ -1,5 +1,6 @@
 -- Oozie 4.1.0 release (trunk - unreleased)
 
+OOZIE-1513 Workflow stays in running if Fork/join validation or loop detection fails (mona)
 OOZIE-1490 Remove unix OS enforcement from build (dwann via tucu)
 OOZIE-1372 When using uber mode, Oozie should also make the AM container size larger (ryota)
 OOZIE-615 Support high availability for the Oozie service (rkanter)