From 05a8148084ab9d5cc8ab2f85466b8a4f5e458251 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@vmware.com>
Date: Thu, 6 Sep 2012 16:06:47 +0200
Subject: [PATCH] =?UTF-8?q?DATAMONGO-530=20-=20Fixed=20propagation=20of=20?=
 =?UTF-8?q?setApplicationContext(=E2=80=A6)=20in=20MappingMongoConverter.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/mapping/MongoMappingContext.java     |  2 ++
 .../mapping/MongoMappingContextUnitTests.java | 22 +++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoMappingContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoMappingContext.java
index 6f99ea091..8f2b65ec0 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoMappingContext.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoMappingContext.java
@@ -83,6 +83,8 @@ public class MongoMappingContext extends AbstractMappingContext<BasicMongoPersis
 	 */
 	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+
 		this.context = applicationContext;
+		super.setApplicationContext(applicationContext);
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoMappingContextUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoMappingContextUnitTests.java
index 16f3c7d5f..785c94155 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoMappingContextUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoMappingContextUnitTests.java
@@ -19,12 +19,19 @@ package org.springframework.data.mongodb.core.mapping;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
+import java.lang.reflect.Field;
 import java.util.Collections;
 import java.util.Map;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.context.ApplicationContext;
 import org.springframework.data.annotation.Id;
+import org.springframework.data.mapping.context.AbstractMappingContext;
 import org.springframework.data.mapping.model.MappingException;
+import org.springframework.util.ReflectionUtils;
 
 import com.mongodb.DBRef;
 
@@ -33,8 +40,12 @@ import com.mongodb.DBRef;
  * 
  * @author Oliver Gierke
  */
+@RunWith(MockitoJUnitRunner.class)
 public class MongoMappingContextUnitTests {
 
+	@Mock
+	ApplicationContext applicationContext;
+
 	@Test
 	public void addsSelfReferencingPersistentEntityCorrectly() throws Exception {
 
@@ -58,6 +69,17 @@ public class MongoMappingContextUnitTests {
 		assertThat(context.getPersistentEntity(DBRef.class), is(nullValue()));
 	}
 
+	@Test
+	public void populatesAbstractMappingContextsApplicationCorrectly() {
+
+		MongoMappingContext context = new MongoMappingContext();
+		context.setApplicationContext(applicationContext);
+
+		Field field = ReflectionUtils.findField(AbstractMappingContext.class, "applicationContext");
+		ReflectionUtils.makeAccessible(field);
+		assertThat(ReflectionUtils.getField(field, context), is(notNullValue()));
+	}
+
 	class ClassWithMultipleIdProperties {
 
 		@Id