svn commit: r1458669 - in /oozie/trunk: core/src/main/java/org/apache/oozie/command/coord/CoordActionStartXCommand.java release-log.txt

[vi...@apache.org]

Author: virag
Date: Wed Mar 20 07:38:18 2013
New Revision: 1458669

URL: http://svn.apache.org/r1458669
Log:
OOZIE-1272 Two workflow jobs mapped to a single coordinator action (ryota via virag)

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

Modified: oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionStartXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionStartXCommand.java?rev=1458669&r1=1458668&r2=1458669&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionStartXCommand.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionStartXCommand.java Wed Mar 20 07:38:18 2013
@@ -266,7 +266,7 @@ public class CoordActionStartXCommand ex
 
     @Override
     protected void loadState() throws CommandException {
-
+        eagerLoadState();
     }
 
     @Override
@@ -292,4 +292,9 @@ public class CoordActionStartXCommand ex
                     + CoordinatorAction.Status.SUBMITTED.name() + " but has status [" + coordAction.getStatus().name() + "]");
         }
     }
+
+    @Override
+    public String getKey(){
+        return getName() + "_" + actionId;
+    }
 }

Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1458669&r1=1458668&r2=1458669&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Wed Mar 20 07:38:18 2013
@@ -7,6 +7,7 @@ OOZIE-1239 Bump up trunk to 4.1.0-SNAPSH
 
 -- Oozie 4.0.0 (unreleased)
 
+OOZIE-1272 Two workflow jobs mapped to a single coordinator action (ryota via virag)
 OOZIE-1274 change recovery service interval to make it consistent with oozie-default.xml (ryota via virag)
 OOZIE-1246 appname need to be persisted on SLA event table by SLA status event (ryota via virag)
 OOZIE-1270 Querying job directly does not pop correct information for coordinator and bundle (rohini via virag)