From d2df9e7f4c2b41bdd18acdda7f841fc3d552f145 Mon Sep 17 00:00:00 2001
From: Been24 <33019455+been24@users.noreply.github.com>
Date: Tue, 16 Jun 2020 18:46:07 +0200
Subject: [PATCH] DATAES-865 - Fix MappingElasticsearchConverter writing an
 Object property containing a Map.

Original PR: #482

(cherry picked from commit 1de1aeb2c7ec80580cb2b4b1d98b724277862463)
---
 .../core/convert/MappingElasticsearchConverter.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverter.java b/src/main/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverter.java
index d4a7fb8f5..9e59443c2 100644
--- a/src/main/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverter.java
+++ b/src/main/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverter.java
@@ -596,7 +596,7 @@ public class MappingElasticsearchConverter
 		Map<Object, Object> target = new LinkedHashMap<>();
 		Streamable<Entry<String, Object>> mapSource = Streamable.of(value.entrySet());
 
-		if (!typeHint.getActualType().getType().equals(Object.class)
+		if (typeHint.getActualType() != null && !typeHint.getActualType().getType().equals(Object.class)
 				&& isSimpleType(typeHint.getMapValueType().getType())) {
 			mapSource.forEach(it -> {