added support for null conversion point type

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1206 50f2f4bb-b051-0410-bef5-90022cba6387

org.springframework.core/src/main/java/org/springframework/core/convert/support/GenericTypeConverter.java

@@ -158,6 +158,10 @@ public class GenericTypeConverter implements TypeConverter, ConverterRegistry {
 			throws ConverterNotFoundException {
 		Assert.notNull(sourceClass, "The sourceType to convert from is required");
 		Assert.notNull(targetType, "The targetType to convert to is required");
+		if (targetType.getType() == null) {
+			// TODO for Andy - is this correct way to handle the Null TypedValue?
+			return NoOpConversionExecutor.INSTANCE;
+		}
 		ConversionPoint sourceType = ConversionPoint.valueOf(sourceClass);
 		if (sourceType.isArray()) {
 			if (targetType.isArray()) {

org.springframework.core/src/test/java/org/springframework/core/convert/support/GenericTypeConverterTests.java

@@ -80,7 +80,18 @@ public class GenericTypeConverterTests {
 	public void convertNull() {
 		assertNull(converter.convert(null, Integer.class));
 	}
+	
+	@Test
+	public void convertNullTargetClass() {
+		assertEquals("3", converter.convert("3", (Class<?>)null));
+	}
 
+	@Test
+	public void convertNullConversionPointType() {
+		assertEquals("3", converter.convert("3", ConversionPoint.NULL));
+	}
+
+	
 	@Test
 	public void convertWrongTypeArgument() {
 		converter.addConverter(new StringToInteger());