Properties values get properly converted to generic Map types (fixing 4.x regression without use of ConversionService)

Issue: SPR-13256

Author: jhoeller

spring-beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java

@@ -521,7 +521,6 @@ private Collection<?> convertToTypedCollection(
 		}
 
 		boolean originalAllowed = requiredType.isInstance(original);
-		typeDescriptor = typeDescriptor.narrow(original);
 		TypeDescriptor elementType = typeDescriptor.getElementTypeDescriptor();
 		if (elementType == null && originalAllowed &&
 				!this.propertyEditorRegistry.hasCustomEditorForElement(null, propertyName)) {
@@ -603,7 +602,6 @@ private Collection<?> convertToTypedCollection(
 		}
 
 		boolean originalAllowed = requiredType.isInstance(original);
-		typeDescriptor = typeDescriptor.narrow(original);
 		TypeDescriptor keyType = typeDescriptor.getMapKeyTypeDescriptor();
 		TypeDescriptor valueType = typeDescriptor.getMapValueTypeDescriptor();
 		if (keyType == null && valueType == null && originalAllowed &&

spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -26,6 +26,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import java.util.Set;
 
 import org.junit.Test;
@@ -182,6 +183,18 @@ public void testGenericMapElementWithCollectionValue() {
 		assertTrue(gb.getCollectionMap().get(new Integer(1)) instanceof HashSet);
 	}
 
+	@Test
+	public void testGenericMapFromProperties() {
+		GenericBean<?> gb = new GenericBean<Object>();
+		BeanWrapper bw = new BeanWrapperImpl(gb);
+		Properties input = new Properties();
+		input.setProperty("4", "5");
+		input.setProperty("6", "7");
+		bw.setPropertyValue("shortMap", input);
+		assertEquals(new Integer(5), gb.getShortMap().get(new Short("4")));
+		assertEquals(new Integer(7), gb.getShortMap().get(new Short("6")));
+	}
+
 	@Test
 	public void testGenericListOfLists() throws MalformedURLException {
 		GenericBean<String> gb = new GenericBean<String>();