From 19384ac8ad6f0feb63ec96206417f17e07e1790d Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 17 Mar 2023 17:37:23 +0100 Subject: [PATCH] Polishing --- .../springframework/beans/PropertyDescriptorUtils.java | 6 +++--- .../beans/factory/support/AbstractBeanDefinition.java | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyDescriptorUtils.java b/spring-beans/src/main/java/org/springframework/beans/PropertyDescriptorUtils.java index 1834cd5d27e..2faf87e0e3c 100644 --- a/spring-beans/src/main/java/org/springframework/beans/PropertyDescriptorUtils.java +++ b/spring-beans/src/main/java/org/springframework/beans/PropertyDescriptorUtils.java @@ -88,9 +88,9 @@ abstract class PropertyDescriptorUtils { BasicPropertyDescriptor pd = pdMap.get(propertyName); if (pd != null) { if (setter) { - Method writedMethod = pd.getWriteMethod(); - if (writedMethod == null || - writedMethod.getParameterTypes()[0].isAssignableFrom(method.getParameterTypes()[0])) { + Method writeMethod = pd.getWriteMethod(); + if (writeMethod == null || + writeMethod.getParameterTypes()[0].isAssignableFrom(method.getParameterTypes()[0])) { pd.setWriteMethod(method); } else { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java index e244edda077..5e049f8d2b0 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java @@ -853,10 +853,12 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess */ @Override public ConstructorArgumentValues getConstructorArgumentValues() { - if (this.constructorArgumentValues == null) { - this.constructorArgumentValues = new ConstructorArgumentValues(); + ConstructorArgumentValues cav = this.constructorArgumentValues; + if (cav == null) { + cav = new ConstructorArgumentValues(); + this.constructorArgumentValues = cav; } - return this.constructorArgumentValues; + return cav; } /**