oozie-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rkan...@apache.org
Subject git commit: OOZIE-1945 NPE in JaveActionExecutor#check() (sree2k via rkanter)
Date Fri, 29 Aug 2014 21:48:54 GMT
Repository: oozie
Updated Branches:
  refs/heads/master 1ea1717bb -> a94011bcb


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/a94011bc
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/a94011bc
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/a94011bc

Branch: refs/heads/master
Commit: a94011bcb0717c73cd3aff2f1a2c017f416e345a
Parents: 1ea1717
Author: Robert Kanter <rkanter@cloudera.com>
Authored: Fri Aug 29 14:48:37 2014 -0700
Committer: Robert Kanter <rkanter@cloudera.com>
Committed: Fri Aug 29 14:48:37 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/a94011bc/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 d6b918c..8cc1a89 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
@@ -1252,10 +1252,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/a94011bc/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index cd33bc2..6b082e6 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -9,6 +9,7 @@ OOZIE-1943 Bump up trunk to 4.2.0-SNAPSHOT (bzhang)
 
 -- 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)


Mime
View raw message