Repository: incubator-gobblin Updated Branches: refs/heads/master 874e5751f -> e06fe8cf2
[GOBBLIN-620] Fix the null pointer exception when catalog metrics is not enabled Closes #2487 from yukuai518/npe2 Project: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/commit/e06fe8cf Tree: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/tree/e06fe8cf Diff: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/diff/e06fe8cf Branch: refs/heads/master Commit: e06fe8cf2ab14d3f25e2248c80c7a535639c3cf7 Parents: 874e575 Author: Kuai Yu <[email protected]> Authored: Thu Oct 25 11:53:22 2018 -0700 Committer: Hung Tran <[email protected]> Committed: Thu Oct 25 11:53:22 2018 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/gobblin/runtime/api/JobCatalog.java | 3 ++- .../src/main/java/org/apache/gobblin/runtime/api/SpecCatalog.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/e06fe8cf/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobCatalog.java ---------------------------------------------------------------------- diff --git a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobCatalog.java b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobCatalog.java index eb54011..5cfa8b9 100644 --- a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobCatalog.java +++ b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobCatalog.java @@ -55,7 +55,8 @@ public interface JobCatalog extends JobCatalogListenersContainer, Instrumentable JobCatalog.StandardMetrics getMetrics(); default Collection<StandardMetricsBridge.StandardMetrics> getStandardMetricsCollection() { - return ImmutableList.of(getMetrics()); + JobCatalog.StandardMetrics standardMetrics = getMetrics(); + return standardMetrics == null? ImmutableList.of() : ImmutableList.of(standardMetrics); } /** http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/e06fe8cf/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/SpecCatalog.java ---------------------------------------------------------------------- diff --git a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/SpecCatalog.java b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/SpecCatalog.java index 0795d03..0312c4e 100644 --- a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/SpecCatalog.java +++ b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/SpecCatalog.java @@ -52,7 +52,8 @@ public interface SpecCatalog extends SpecCatalogListenersContainer, Instrumentab SpecCatalog.StandardMetrics getMetrics(); default Collection<StandardMetricsBridge.StandardMetrics> getStandardMetricsCollection() { - return ImmutableList.of(this.getMetrics()); + SpecCatalog.StandardMetrics standardMetrics = getMetrics(); + return standardMetrics == null? ImmutableList.of() : ImmutableList.of(standardMetrics); } /**
