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

[vi...@apache.org]

Author: virag
Date: Fri Jun 28 22:22:24 2013
New Revision: 1497949

URL: http://svn.apache.org/r1497949
Log:
OOZIE-1433 ActionCheckX should override XCommand.getKey() to prevent duplicates (virag)

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

Modified: oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionCheckXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionCheckXCommand.java?rev=1497949&r1=1497948&r2=1497949&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionCheckXCommand.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionCheckXCommand.java Fri Jun 28 22:22:24 2013
@@ -244,4 +244,9 @@ public class ActionCheckXCommand extends
         return (executor != null) ? executor.getRetryInterval() : ActionExecutor.RETRY_INTERVAL;
     }
 
+    @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=1497949&r1=1497948&r2=1497949&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Fri Jun 28 22:22:24 2013
@@ -1,5 +1,6 @@
 -- Oozie 4.1.0 release (trunk - unreleased)
 
+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)
 OOZIE-1427 Update CredentialsModule docs to mention Hive (rkanter)
 OOZIE-1429 Fix bugs in SLA UI (rohini)