diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/Spr7816Tests.java b/org.springframework.context/src/test/java/org/springframework/context/support/Spr7816Tests.java
new file mode 100644
index 0000000000..998049819c
--- /dev/null
+++ b/org.springframework.context/src/test/java/org/springframework/context/support/Spr7816Tests.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2002-2010 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.context.support;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Map;
+
+import org.junit.Test;
+import org.springframework.context.ApplicationContext;
+
+/**
+ * @author Keith Donald
+ * @author Juergen Hoeller
+ */
+public class Spr7816Tests {
+
+	@Test
+	public void spr7816() {
+		ApplicationContext ctx = new ClassPathXmlApplicationContext("spr7816.xml", getClass());
+		FilterAdapter adapter = ctx.getBean(FilterAdapter.class);
+		assertEquals(Building.class, adapter.getSupportedTypes().get("Building"));
+		assertEquals(Entrance.class, adapter.getSupportedTypes().get("Entrance"));
+		assertEquals(Dwelling.class, adapter.getSupportedTypes().get("Dwelling"));
+	}
+	
+	public static class FilterAdapter {
+		
+		private String extensionPrefix;
+		
+		private Map<String, Class<? extends DomainEntity>> supportedTypes;
+		
+		public FilterAdapter(final String extensionPrefix, final Map<String, Class<? extends DomainEntity>> supportedTypes) {
+			this.extensionPrefix = extensionPrefix;
+			this.supportedTypes = supportedTypes;
+		}
+
+		public String getExtensionPrefix() {
+			return extensionPrefix;
+		}
+
+		public Map<String, Class<? extends DomainEntity>> getSupportedTypes() {
+			return supportedTypes;
+		}
+
+	}
+	
+	public static class Building extends DomainEntity {
+	}
+	
+	public static class Entrance extends DomainEntity {
+	}
+	
+	public static class Dwelling extends DomainEntity {
+	}
+	
+	public abstract static class DomainEntity {
+		
+	}
+}
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/spr7816.xml b/org.springframework.context/src/test/java/org/springframework/context/support/spr7816.xml
new file mode 100644
index 0000000000..4c399578a8
--- /dev/null
+++ b/org.springframework.context/src/test/java/org/springframework/context/support/spr7816.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+
+<beans>
+
+	<bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean" />
+
+	<bean id="filterAdapter" class="org.springframework.context.support.Spr7816Tests$FilterAdapter">
+		<constructor-arg value="building:" />
+		<constructor-arg>
+			<map>
+				<entry key="Building" value="org.springframework.context.support.Spr7816Tests$Building" />
+				<entry key="Entrance" value="org.springframework.context.support.Spr7816Tests$Entrance" />
+				<entry key="Dwelling" value="org.springframework.context.support.Spr7816Tests$Dwelling" />
+			</map>
+		</constructor-arg>
+	</bean>
+	
+</beans>