From a575b7741e3a328721265fbfc8b847e785ecedac Mon Sep 17 00:00:00 2001
From: Przemyslaw Witek <przemyslaw.witek@elastic.co>
Date: Mon, 16 Aug 2021 14:42:38 +0200
Subject: [PATCH] Protect against DateHistogramGroupSource.field being null

---
 .../transform/checkpoint/TimeBasedCheckpointProvider.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/TimeBasedCheckpointProvider.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/TimeBasedCheckpointProvider.java
index 4789bdd1c7188..40c63907773f6 100644
--- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/TimeBasedCheckpointProvider.java
+++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/TimeBasedCheckpointProvider.java
@@ -27,6 +27,7 @@
 import org.elasticsearch.xpack.transform.persistence.TransformConfigManager;
 
 import java.time.Clock;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.Map;
@@ -136,7 +137,7 @@ private static Function<Long, Long> createAlignTimestampFunction(TransformConfig
             groups.values().stream()
                 .filter(DateHistogramGroupSource.class::isInstance)
                 .map(DateHistogramGroupSource.class::cast)
-                .filter(group -> group.getField().equals(transformConfig.getSyncConfig().getField()))
+                .filter(group -> Objects.equals(group.getField(), transformConfig.getSyncConfig().getField()))
                 .findFirst();
         if (dateHistogramGroupSource.isEmpty()) {
             return identity();