Skip to content

Commit 1de1aeb

Browse files
authored
DATAES - 865 - Fix MappingElasticsearchConverter writing an Object property containing a Map.
Original PR: spring-projects#482
1 parent b177dd1 commit 1de1aeb

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/main/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ private Object writeMapValue(Map<String, Object> value, ElasticsearchPersistentP
596596
Map<Object, Object> target = new LinkedHashMap<>();
597597
Streamable<Entry<String, Object>> mapSource = Streamable.of(value.entrySet());
598598

599-
if (!typeHint.getActualType().getType().equals(Object.class)
599+
if (typeHint.getActualType() != null && !typeHint.getActualType().getType().equals(Object.class)
600600
&& isSimpleType(typeHint.getMapValueType().getType())) {
601601
mapSource.forEach(it -> {
602602

0 commit comments

Comments
 (0)