Repository: oozie Updated Branches: refs/heads/branch-4.1 ceeb54f8a -> 2f5b4235e
OOZIE-1945 NPE in JaveActionExecutor#check() (sree2k via rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/2f5b4235 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/2f5b4235 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/2f5b4235 Branch: refs/heads/branch-4.1 Commit: 2f5b4235ebcf41e5a2e4b520441ca11af9a26a8c Parents: ceeb54f Author: Robert Kanter <[email protected]> Authored: Fri Aug 29 14:47:52 2014 -0700 Committer: Robert Kanter <[email protected]> Committed: Fri Aug 29 14:47:52 2014 -0700 ---------------------------------------------------------------------- .../java/org/apache/oozie/action/hadoop/JavaActionExecutor.java | 4 ++-- release-log.txt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/2f5b4235/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java index 7f4d473..3e2fe50 100644 --- a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java +++ b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java @@ -1254,10 +1254,10 @@ public class JavaActionExecutor extends ActionExecutor { Properties props = PropertiesUtils.stringToProperties(actionData .get(LauncherMapper.ACTION_DATA_ERROR_PROPS)); String errorCode = props.getProperty("error.code"); - if (errorCode.equals("0")) { + if ("0".equals(errorCode)) { errorCode = "JA018"; } - if (errorCode.equals("-1")) { + if ("-1".equals(errorCode)) { errorCode = "JA019"; } errorReason = props.getProperty("error.reason"); http://git-wip-us.apache.org/repos/asf/oozie/blob/2f5b4235/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 2067607..dd6e3b1 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.1.0 release (4.1 - unreleased) +OOZIE-1945 NPE in JaveActionExecutor#check() (sree2k via rkanter) OOZIE-1984 SLACalculator in HA mode performs duplicate operations on records with completed jobs (mona) OOZIE-1958 address duplication of env variables in oozie.launcher.yarn.app.mapreduce.am.env when running with uber mode (ryota) OOZIE-1920 Capture Output for SSH Action doesn't work (Richard Williams via rkanter)
