Repository: oozie
Updated Branches:
  refs/heads/master 04a6d0541 -> 800ea758e


OOZIE-2940 Possible NullPointerException in WorkflowActionBean (dionusos via 
gezapeti)


Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/800ea758
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/800ea758
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/800ea758

Branch: refs/heads/master
Commit: 800ea758ea821ab16e16d94178dadd3fb71b6b53
Parents: 04a6d05
Author: Gezapeti Cseh <gezap...@gmail.com>
Authored: Tue Aug 15 11:58:30 2017 +0200
Committer: Gezapeti Cseh <gezap...@gmail.com>
Committed: Tue Aug 15 11:58:30 2017 +0200

----------------------------------------------------------------------
 core/src/main/java/org/apache/oozie/WorkflowActionBean.java | 2 +-
 release-log.txt                                             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oozie/blob/800ea758/core/src/main/java/org/apache/oozie/WorkflowActionBean.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/WorkflowActionBean.java 
b/core/src/main/java/org/apache/oozie/WorkflowActionBean.java
index 60f3b64..14f36ed 100644
--- a/core/src/main/java/org/apache/oozie/WorkflowActionBean.java
+++ b/core/src/main/java/org/apache/oozie/WorkflowActionBean.java
@@ -599,7 +599,7 @@ public class WorkflowActionBean implements Writable, 
WorkflowAction, JsonBean {
     public void setEndData(Status status, String signalValue) {
         if (status == null || (status != Status.OK && status != Status.ERROR 
&& status != Status.KILLED)) {
             throw new IllegalArgumentException("Action status must be OK, 
ERROR or KILLED. Received ["
-                    + status.toString() + "]");
+                    + (status == null ? "null" : status.toString()) + "]");
         }
         if (status == Status.OK) {
             setErrorInfo(null, null);

http://git-wip-us.apache.org/repos/asf/oozie/blob/800ea758/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index f3a1b46..1db2874 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.0.0 release (trunk - unreleased)
 
+OOZIE-2940 Possible NullPointerException in WorkflowActionBean (dionusos via 
gezapeti)
 OOZIE-3036 Spark 2.2.0 support: tell Spark not to get any delegation tokens 
(andras.piros via gezapeti)
 OOZIE-3028 Oozie Pig Action fails with no python dependencies (dbist13 via 
rohini)
 OOZIE-2670 Upgrade Hbase to 1.2 (gezapeti via asasvari)

Reply via email to