From 1e01832b0c522eea1f0e9ff0dfdec222cff6d598 Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Mon, 3 Aug 2020 16:40:11 +0200 Subject: [PATCH] fix possible NPE introduced in #60591 --- .../transforms/pivot/CompositeBucketsChangeCollector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/CompositeBucketsChangeCollector.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/CompositeBucketsChangeCollector.java index ade63afa51a..1aea4f0d457 100644 --- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/CompositeBucketsChangeCollector.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/CompositeBucketsChangeCollector.java @@ -565,7 +565,7 @@ public class CompositeBucketsChangeCollector implements ChangeCollector { entry.getKey(), entry.getValue().getMissingBucket(), ((DateHistogramGroupSource) entry.getValue()).getRounding(), - entry.getValue().getField().equals(synchronizationField) + entry.getValue().getField() != null && entry.getValue().getField().equals(synchronizationField) ) ); break;