Browse Source

Polishing

pull/30139/head
Juergen Hoeller 3 years ago
parent
commit
19384ac8ad
  1. 6
      spring-beans/src/main/java/org/springframework/beans/PropertyDescriptorUtils.java
  2. 8
      spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java

6
spring-beans/src/main/java/org/springframework/beans/PropertyDescriptorUtils.java

@ -88,9 +88,9 @@ abstract class PropertyDescriptorUtils {
BasicPropertyDescriptor pd = pdMap.get(propertyName); BasicPropertyDescriptor pd = pdMap.get(propertyName);
if (pd != null) { if (pd != null) {
if (setter) { if (setter) {
Method writedMethod = pd.getWriteMethod(); Method writeMethod = pd.getWriteMethod();
if (writedMethod == null || if (writeMethod == null ||
writedMethod.getParameterTypes()[0].isAssignableFrom(method.getParameterTypes()[0])) { writeMethod.getParameterTypes()[0].isAssignableFrom(method.getParameterTypes()[0])) {
pd.setWriteMethod(method); pd.setWriteMethod(method);
} }
else { else {

8
spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java

@ -853,10 +853,12 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
*/ */
@Override @Override
public ConstructorArgumentValues getConstructorArgumentValues() { public ConstructorArgumentValues getConstructorArgumentValues() {
if (this.constructorArgumentValues == null) { ConstructorArgumentValues cav = this.constructorArgumentValues;
this.constructorArgumentValues = new ConstructorArgumentValues(); if (cav == null) {
cav = new ConstructorArgumentValues();
this.constructorArgumentValues = cav;
} }
return this.constructorArgumentValues; return cav;
} }
/** /**

Loading…
Cancel
Save