Repository: tez Updated Branches: refs/heads/master 97e1d867d -> 36f358a85
TEZ-2860. NPE in DAGClientImpl (Jeff Zhang via hitesh) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/36f358a8 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/36f358a8 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/36f358a8 Branch: refs/heads/master Commit: 36f358a85035b988dfc97b84a98c9d58c196bdaa Parents: 97e1d86 Author: Hitesh Shah <[email protected]> Authored: Thu Oct 1 08:31:39 2015 -0700 Committer: Hitesh Shah <[email protected]> Committed: Thu Oct 1 08:31:39 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../main/java/org/apache/tez/dag/api/client/DAGClientImpl.java | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/36f358a8/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 8e1c1b3..12728d0 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -7,6 +7,7 @@ Release 0.8.1: Unreleased INCOMPATIBLE CHANGES ALL CHANGES: + TEZ-2860. NPE in DAGClientImpl. TEZ-2855. Fix a potential NPE while routing VertexManager events. TEZ-2758. Remove append API in RecoveryService after TEZ-1909. TEZ-2851. Support a way for upstream applications to pass in a caller context to Tez. @@ -197,6 +198,7 @@ Release 0.7.1: Unreleased INCOMPATIBLE CHANGES ALL CHANGES + TEZ-2860. NPE in DAGClientImpl. TEZ-2855. Fix a potential NPE while routing VertexManager events. TEZ-2758. Remove append API in RecoveryService after TEZ-1909. TEZ-2851. Support a way for upstream applications to pass in a caller context to Tez. @@ -470,6 +472,7 @@ Release 0.6.3: Unreleased INCOMPATIBLE CHANGES ALL CHANGES: + TEZ-2860. NPE in DAGClientImpl. TEZ-2855. Fix a potential NPE while routing VertexManager events. TEZ-2716. DefaultSorter.isRleNeeded not thread safe TEZ-2758. Remove append API in RecoveryService after TEZ-1909. http://git-wip-us.apache.org/repos/asf/tez/blob/36f358a8/tez-api/src/main/java/org/apache/tez/dag/api/client/DAGClientImpl.java ---------------------------------------------------------------------- diff --git a/tez-api/src/main/java/org/apache/tez/dag/api/client/DAGClientImpl.java b/tez-api/src/main/java/org/apache/tez/dag/api/client/DAGClientImpl.java index 47c8a8e..fa22c32 100644 --- a/tez-api/src/main/java/org/apache/tez/dag/api/client/DAGClientImpl.java +++ b/tez-api/src/main/java/org/apache/tez/dag/api/client/DAGClientImpl.java @@ -467,8 +467,9 @@ public class DAGClientImpl extends DAGClient { } } } - - builder.addAllDiagnostics(Collections.singleton(appReport.getDiagnostics())); + if (appReport.getDiagnostics() != null) { + builder.addAllDiagnostics(Collections.singleton(appReport.getDiagnostics())); + } return dagStatus; }
