From 89e7caa35b69ed09aa8691391e0df5717445d1ef Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Wed, 7 Oct 2009 17:36:30 +0000
Subject: [PATCH] polish

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2069 50f2f4bb-b051-0410-bef5-90022cba6387
---
 .../springframework/mapping/support/MappingContextHolder.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/org.springframework.context/src/main/java/org/springframework/mapping/support/MappingContextHolder.java b/org.springframework.context/src/main/java/org/springframework/mapping/support/MappingContextHolder.java
index fbb3bc407da..dfa03cc4843 100644
--- a/org.springframework.context/src/main/java/org/springframework/mapping/support/MappingContextHolder.java
+++ b/org.springframework.context/src/main/java/org/springframework/mapping/support/MappingContextHolder.java
@@ -45,7 +45,8 @@ class MappingContextHolder {
 	 * Is the source being mapped or has already been mapped?
 	 */
 	public static boolean contains(Object source) {
-		return getContext().contains(source);
+		Stack<Object> context = getContext();
+		return context != null ? context.contains(source) : false;
 	}
 
 	/**