Avoid full synchronization in refreshable getBeanFactory() implementation

Closes gh-25081

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

@@ -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");
  * 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. */
 	@Nullable
-	private DefaultListableBeanFactory beanFactory;
+	private volatile DefaultListableBeanFactory beanFactory;
-
-	/** Synchronization monitor for the internal BeanFactory. */
-	private final Object beanFactoryMonitor = new Object();
 
 
 	/**
@@ -131,9 +128,7 @@ public abstract class AbstractRefreshableApplicationContext extends AbstractAppl
 			beanFactory.setSerializationId(getId());
 			customizeBeanFactory(beanFactory);
 			loadBeanDefinitions(beanFactory);
-			synchronized (this.beanFactoryMonitor) {
+			this.beanFactory = beanFactory;
-				this.beanFactory = beanFactory;
-			}
 		}
 		catch (IOException ex) {
 			throw new ApplicationContextException("I/O error parsing bean definition source for " + getDisplayName(), ex);
@@ -142,21 +137,19 @@ public abstract class AbstractRefreshableApplicationContext extends AbstractAppl
 
 	@Override
 	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);
 	}
 
 	@Override
 	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;
-			}
 		}
 	}
 
@@ -165,20 +158,17 @@ public abstract class AbstractRefreshableApplicationContext extends AbstractAppl
 	 * i.e. has been refreshed at least once and not been closed yet.
 	 */
 	protected final boolean hasBeanFactory() {
-		synchronized (this.beanFactoryMonitor) {
+		return (this.beanFactory != null);
-			return (this.beanFactory != null);
-		}
 	}
 
 	@Override
 	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;
 	}
 
 	/**