root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fixed @PathVariable regression in combination with ConversionService usage on DataBinder 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3504 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Juergen Hoeller 2010-07-26 20:14:57 +00:00
parent a4d48f721c
commit 085449cf1e
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
org.springframework.beans/src/main/java/org/springframework/beans/SimpleTypeConverter.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2009 the original author or authors. * Copyright 2002-2010 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -17,6 +17,8 @@
package org.springframework.beans; package org.springframework.beans;
import org.springframework.core.MethodParameter; import org.springframework.core.MethodParameter;
import org.springframework.core.convert.ConversionException;
import org.springframework.core.convert.ConverterNotFoundException;
/** /**
* Simple implementation of the TypeConverter interface that does not operate * Simple implementation of the TypeConverter interface that does not operate
@ -46,12 +48,18 @@ public class SimpleTypeConverter extends PropertyEditorRegistrySupport implement
try { try {
return this.typeConverterDelegate.convertIfNecessary(value, requiredType, methodParam); return this.typeConverterDelegate.convertIfNecessary(value, requiredType, methodParam);
} }
catch (IllegalArgumentException ex) { catch (ConverterNotFoundException ex) {
throw new ConversionNotSupportedException(value, requiredType, ex);
}
catch (ConversionException ex) {
throw new TypeMismatchException(value, requiredType, ex); throw new TypeMismatchException(value, requiredType, ex);
} }
catch (IllegalStateException ex) { catch (IllegalStateException ex) {
throw new ConversionNotSupportedException(value, requiredType, ex); throw new ConversionNotSupportedException(value, requiredType, ex);
} }
catch (IllegalArgumentException ex) {
throw new TypeMismatchException(value, requiredType, ex);
}
} }
} }

2
org.springframework.context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java
View File

@ -57,8 +57,10 @@ public abstract class AbstractPropertyBindingResult extends AbstractBindingResul
public void initConversion(ConversionService conversionService) { public void initConversion(ConversionService conversionService) {
Assert.notNull(conversionService, "ConversionService must not be null"); Assert.notNull(conversionService, "ConversionService must not be null");
this.conversionService = conversionService; this.conversionService = conversionService;
if (getTarget() != null) {
getPropertyAccessor().setConversionService(conversionService); getPropertyAccessor().setConversionService(conversionService);
} }
}
/** /**
* Returns the underlying PropertyAccessor. * Returns the underlying PropertyAccessor.