root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Avoid full synchronization in refreshable getBeanFactory() implementation 

Closes gh-25081
This commit is contained in:
Juergen Hoeller 2020-05-18 14:22:24 +02:00
parent 35f3277910
commit 06cfd80c1c
1 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -72,10 +72,7 @@ public abstract class AbstractRefreshableApplicationContext extends AbstractAppl
/** Bean factory for this context. */ /** Bean factory for this context. */
@Nullable @Nullable
private DefaultListableBeanFactory beanFactory; private volatile DefaultListableBeanFactory beanFactory;
/** Synchronization monitor for the internal BeanFactory. */
private final Object beanFactoryMonitor = new Object();
/** /**
@ -131,10 +128,8 @@ public abstract class AbstractRefreshableApplicationContext extends AbstractAppl
beanFactory.setSerializationId(getId()); beanFactory.setSerializationId(getId());
customizeBeanFactory(beanFactory); customizeBeanFactory(beanFactory);
loadBeanDefinitions(beanFactory); loadBeanDefinitions(beanFactory);
synchronized (this.beanFactoryMonitor) {
this.beanFactory = beanFactory; this.beanFactory = beanFactory;
} }
}
catch (IOException ex) { catch (IOException ex) {
throw new ApplicationContextException("I/O error parsing bean definition source for " + getDisplayName(), ex); throw new ApplicationContextException("I/O error parsing bean definition source for " + getDisplayName(), ex);
} }
@ -142,43 +137,38 @@ public abstract class AbstractRefreshableApplicationContext extends AbstractAppl
@Override @Override
protected void cancelRefresh(BeansException ex) { protected void cancelRefresh(BeansException ex) {
synchronized (this.beanFactoryMonitor) { DefaultListableBeanFactory beanFactory = this.beanFactory;
if (this.beanFactory != null) { if (beanFactory != null) {
this.beanFactory.setSerializationId(null); beanFactory.setSerializationId(null);
}
} }
super.cancelRefresh(ex); super.cancelRefresh(ex);
} }
@Override @Override
protected final void closeBeanFactory() { protected final void closeBeanFactory() {
synchronized (this.beanFactoryMonitor) { DefaultListableBeanFactory beanFactory = this.beanFactory;
if (this.beanFactory != null) { if (beanFactory != null) {
this.beanFactory.setSerializationId(null); beanFactory.setSerializationId(null);
this.beanFactory = null; this.beanFactory = null;
} }
} }
}
/** /**
* Determine whether this context currently holds a bean factory, * Determine whether this context currently holds a bean factory,
* i.e. has been refreshed at least once and not been closed yet. * i.e. has been refreshed at least once and not been closed yet.
*/ */
protected final boolean hasBeanFactory() { protected final boolean hasBeanFactory() {
synchronized (this.beanFactoryMonitor) {
return (this.beanFactory != null); return (this.beanFactory != null);
} }
}
@Override @Override
public final ConfigurableListableBeanFactory getBeanFactory() { public final ConfigurableListableBeanFactory getBeanFactory() {
synchronized (this.beanFactoryMonitor) { DefaultListableBeanFactory beanFactory = this.beanFactory;
if (this.beanFactory == null) { if (beanFactory == null) {
throw new IllegalStateException("BeanFactory not initialized or already closed - " + throw new IllegalStateException("BeanFactory not initialized or already closed - " +
"call 'refresh' before accessing beans via the ApplicationContext"); "call 'refresh' before accessing beans via the ApplicationContext");
} }
return this.beanFactory; return beanFactory;
}
} }
/** /**