SimpleAliasRegistry detects resolved aliases that loop back to the original name (SPR-5419); PropertyPlaceholderConfigurer does not modify Map in case of equal String keys (SPR-5318); inner class names in Java source style ("java.lang.Thread.State") supported as well (SPR-5210)
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2002-2008 the original author or authors.
|
||||
* Copyright 2002-2009 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.
|
||||
@@ -264,7 +264,9 @@ public class BeanDefinitionVisitor {
|
||||
throw new IllegalStateException("No StringValueResolver specified - pass a resolver " +
|
||||
"object into the constructor or override the 'resolveStringValue' method");
|
||||
}
|
||||
return this.valueResolver.resolveStringValue(strVal);
|
||||
String resolvedValue = this.valueResolver.resolveStringValue(strVal);
|
||||
// Return original String if not modified.
|
||||
return (strVal.equals(resolvedValue) ? strVal : resolvedValue);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user