[oozie] branch master updated: OOZIE-3589 Avoid calling copyActionData method multiple times in ReRunXCommand (zuston via asalamon74)

[as...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

asalamon74 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/oozie.git


The following commit(s) were added to refs/heads/master by this push:
     new fcdb729  OOZIE-3589 Avoid calling copyActionData method multiple times in ReRunXCommand (zuston via asalamon74)
fcdb729 is described below

commit fcdb729bb13beb46fb69c4cbbfa8a4f06f0c216d
Author: Andras Salamon <as...@apache.org>
AuthorDate: Mon Mar 2 13:43:21 2020 +0100

    OOZIE-3589 Avoid calling copyActionData method multiple times in ReRunXCommand (zuston via asalamon74)
---
 core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java | 7 ++++---
 release-log.txt                                                   | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java b/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java
index 92c0a67..a8a082b 100644
--- a/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java
@@ -219,9 +219,10 @@ public class ReRunXCommand extends WorkflowXCommand<Void> {
                 deleteList.add(actions.get(i));
                 LOG.info("Deleting Action[{0}] for re-run", actions.get(i).getId());
             }
-            else {
-                copyActionData(newWfInstance, oldWfInstance);
-            }
+        }
+
+        if (deleteList.size() < actions.size()) {
+            copyActionData(newWfInstance, oldWfInstance);
         }
 
         wfBean.setAppPath(conf.get(OozieClient.APP_PATH));
diff --git a/release-log.txt b/release-log.txt
index 6f1248e..8a006d6 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.3.0 release (trunk - unreleased)
 
+OOZIE-3589 Avoid calling copyActionData method multiple times in ReRunXCommand (zuston via asalamon74)
 OOZIE-3590 Fix missing log expression parameter in SLACalculatorMemory (zuston via asalamon74)
 OOZIE-3551 Spark shouldn't obtain tokens withing the Spark action (Liz Szilagyi via gezapeti)
 OOZIE-3574 JavaAction create incorrect fileSystem instance in addActionLibs method (zuston via asalamon74)