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

[ry...@apache.org]

Author: ryota
Date: Sat Jun 29 00:15:08 2013
New Revision: 1497959

URL: http://svn.apache.org/r1497959
Log:
OOZIE-1438 parentID is null in job event message of subworkflow action (ryota)

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=1497959&r1=1497958&r2=1497959&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 Sat Jun 29 00:15:08 2013
@@ -334,9 +334,10 @@ public class SignalXCommand extends Work
                 if (coordAction != null) {
                     wfJob.setParentId(coordAction.getId());
                 }
-                else {
+                else if (wfJob.getParentId() == null) {
                     wfJob.setParentId(parentId);
                 }
+                // doesn't overwrite parentId in subworkflow action
                 generateEvent(wfJob, wfJobErrorCode, wfJobErrorMsg);
             }
         }

Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1497959&r1=1497958&r2=1497959&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Sat Jun 29 00:15:08 2013
@@ -1,5 +1,6 @@
 -- Oozie 4.1.0 release (trunk - unreleased)
 
+OOZIE-1438 parentID is null in job event message of subworkflow action (ryota)
 OOZIE-1435 StatusTransitService unnecessarily updates the lastModifiedTime of jobs which causes MaterializationService to bring same jobs in memory (virag)
 OOZIE-1433 ActionCheckX should override XCommand.getKey() to prevent duplicates (virag)
 OOZIE-1436 Revert SLA_XML and few other varchar columns back to clob (virag)