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

Polish

Browse Source
This commit is contained in:
Phillip Webb
2012-11-01 11:10:25 -07:00
parent 15b64ba601
commit 468f9c7814
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-context/src/main/java/org/springframework/jmx/support/RegistrationPolicy.java
View File

@@ -51,7 +51,7 @@ public enum RegistrationPolicy {
* available in {@link MBeanRegistrationSupport}.
*/
@SuppressWarnings("deprecation")
public static RegistrationPolicy valueOf(int registrationBehavior) {
static RegistrationPolicy valueOf(int registrationBehavior) {
switch (registrationBehavior) {
case MBeanRegistrationSupport.REGISTRATION_IGNORE_EXISTING:
return RegistrationPolicy.IGNORE_EXISTING;

3
spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
View File

@@ -451,7 +451,8 @@ public class GenericConversionService implements ConfigurableConversionService {
Assert.state(converter instanceof ConditionalConverter,
"Only conditional converters may return null convertible types");
globalConverters.add(converter);
} else {
}
else {
for (ConvertiblePair convertiblePair : convertibleTypes) {
ConvertersForPair convertersForPair = getMatchableConverters(convertiblePair);
convertersForPair.add(converter);