From 0eaa4db1af23c8e9a457b18023f992b4a0a876da Mon Sep 17 00:00:00 2001
From: dmaass <dennis.maass@netpioneer.de>
Date: Wed, 17 Dec 2014 10:16:25 +0000
Subject: [PATCH] DATAES-141 add new constructor to fix: Mapping Context is
 null in DefaultResultMapper when using custom Entitymapper (cherry picked
 from commit 2367d89)

---
 .../data/elasticsearch/core/DefaultResultMapper.java       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/org/springframework/data/elasticsearch/core/DefaultResultMapper.java b/src/main/java/org/springframework/data/elasticsearch/core/DefaultResultMapper.java
index 2f69a712c..bf6020006 100644
--- a/src/main/java/org/springframework/data/elasticsearch/core/DefaultResultMapper.java
+++ b/src/main/java/org/springframework/data/elasticsearch/core/DefaultResultMapper.java
@@ -65,6 +65,13 @@ public class DefaultResultMapper extends AbstractResultMapper {
 		super(entityMapper);
 	}
 
+	public DefaultResultMapper(
+			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext,
+			EntityMapper entityMapper) {
+		super(entityMapper);
+		this.mappingContext = mappingContext;
+	}
+
 	@Override
 	public <T> FacetedPage<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable) {
 		long totalHits = response.getHits().totalHits();