|
|
|
@ -1,5 +1,5 @@
@@ -1,5 +1,5 @@
|
|
|
|
|
/* |
|
|
|
|
* Copyright 2002-2011 the original author or authors. |
|
|
|
|
* Copyright 2002-2012 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. |
|
|
|
@ -245,7 +245,8 @@ class TypeConverterDelegate {
@@ -245,7 +245,8 @@ class TypeConverterDelegate {
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (firstAttemptEx != null) { |
|
|
|
|
if (editor == null && convertedValue == newValue && requiredType!=null && !ClassUtils.isAssignableValue(requiredType, convertedValue)) { |
|
|
|
|
if (editor == null && convertedValue == newValue && requiredType != null && |
|
|
|
|
!ClassUtils.isAssignableValue(requiredType, convertedValue)) { |
|
|
|
|
throw firstAttemptEx; |
|
|
|
|
} |
|
|
|
|
logger.debug("Original ConversionService attempt failed - ignored since " + |
|
|
|
|