Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revised IllegalArgumentException handling for Formatter parse calls

Browse Source 
Issue: SPR-14661
(cherry picked from commit c69e6a3)
This commit is contained in:
Juergen Hoeller
2016-09-13 21:55:20 +02:00
parent 09a0615df0
commit 73bbe0849a
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-beans/src/main/java/org/springframework/beans/AbstractNestablePropertyAccessor.java
View File

@@ -590,7 +590,7 @@ public abstract class AbstractNestablePropertyAccessor extends AbstractPropertyA
new PropertyChangeEvent(this.rootObject, this.nestedPath + propertyName, oldValue, newValue); new PropertyChangeEvent(this.rootObject, this.nestedPath + propertyName, oldValue, newValue);
throw new ConversionNotSupportedException(pce, requiredType, ex); throw new ConversionNotSupportedException(pce, requiredType, ex);
} }
catch (Throwable ex) { catch (IllegalArgumentException ex) {
PropertyChangeEvent pce = PropertyChangeEvent pce =
new PropertyChangeEvent(this.rootObject, this.nestedPath + propertyName, oldValue, newValue); new PropertyChangeEvent(this.rootObject, this.nestedPath + propertyName, oldValue, newValue);
throw new TypeMismatchException(pce, requiredType, ex); throw new TypeMismatchException(pce, requiredType, ex);

2
spring-beans/src/main/java/org/springframework/beans/TypeConverterSupport.java
View File

@@ -73,7 +73,7 @@ public abstract class TypeConverterSupport extends PropertyEditorRegistrySupport
catch (IllegalStateException ex) { catch (IllegalStateException ex) {
throw new ConversionNotSupportedException(value, requiredType, ex); throw new ConversionNotSupportedException(value, requiredType, ex);
} }
catch (Throwable ex) { catch (IllegalArgumentException ex) {
throw new TypeMismatchException(value, requiredType, ex); throw new TypeMismatchException(value, requiredType, ex);
} }
} }

6
spring-context/src/main/java/org/springframework/format/support/FormatterPropertyEditorAdapter.java
View File

@@ -18,7 +18,6 @@ package org.springframework.format.support;
import java.beans.PropertyEditor; import java.beans.PropertyEditor;
import java.beans.PropertyEditorSupport; import java.beans.PropertyEditorSupport;
import java.text.ParseException;
import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.format.Formatter; import org.springframework.format.Formatter;
@@ -65,7 +64,10 @@ public class FormatterPropertyEditorAdapter extends PropertyEditorSupport {
try { try {
setValue(this.formatter.parse(text, LocaleContextHolder.getLocale())); setValue(this.formatter.parse(text, LocaleContextHolder.getLocale()));
} }
catch (ParseException ex) { catch (IllegalArgumentException ex) {
throw ex;
}
catch (Throwable ex) {
throw new IllegalArgumentException("Parse attempt failed for value [" + text + "]", ex); throw new IllegalArgumentException("Parse attempt failed for value [" + text + "]", ex);
} }
} }

8
spring-context/src/main/java/org/springframework/format/support/FormattingConversionService.java
View File

@@ -17,7 +17,6 @@
package org.springframework.format.support; package org.springframework.format.support;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.text.ParseException;
import java.util.Collections; import java.util.Collections;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@@ -193,11 +192,14 @@ public class FormattingConversionService extends GenericConversionService
try { try {
result = this.parser.parse(text, LocaleContextHolder.getLocale()); result = this.parser.parse(text, LocaleContextHolder.getLocale());
} }
catch (ParseException ex) { catch (IllegalArgumentException ex) {
throw ex;
}
catch (Throwable ex) {
throw new IllegalArgumentException("Parse attempt failed for value [" + text + "]", ex); throw new IllegalArgumentException("Parse attempt failed for value [" + text + "]", ex);
} }
if (result == null) { if (result == null) {
throw new IllegalStateException("Parsers are not allowed to return null"); throw new IllegalStateException("Parsers are not allowed to return null: " + this.parser);
} }
TypeDescriptor resultType = TypeDescriptor.valueOf(result.getClass()); TypeDescriptor resultType = TypeDescriptor.valueOf(result.getClass());
if (!resultType.isAssignableTo(targetType)) { if (!resultType.isAssignableTo(targetType)) {