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

Restore defensive access to volatile field in getBeanClassName()

Browse Source 
Closes gh-30773
This commit is contained in:
Juergen Hoeller
2023-06-29 12:04:53 +02:00
parent 3cb746c358
commit 0a20c8a44a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java
View File

@@ -390,7 +390,8 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
@Override @Override
@Nullable @Nullable
public String getBeanClassName() { public String getBeanClassName() {
return (this.beanClass instanceof Class<?> clazz ? clazz.getName() : (String) this.beanClass); Object beanClassObject = this.beanClass; // defensive access to volatile beanClass field
return (beanClassObject instanceof Class<?> clazz ? clazz.getName() : (String) beanClassObject);
} }
/** /**
@@ -423,7 +424,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
* @see #resolveBeanClass(ClassLoader) * @see #resolveBeanClass(ClassLoader)
*/ */
public Class<?> getBeanClass() throws IllegalStateException { public Class<?> getBeanClass() throws IllegalStateException {
Object beanClassObject = this.beanClass; Object beanClassObject = this.beanClass; // defensive access to volatile beanClass field
if (beanClassObject == null) { if (beanClassObject == null) {
throw new IllegalStateException("No bean class specified on bean definition"); throw new IllegalStateException("No bean class specified on bean definition");
} }