Don't syncrhonize the entire loading operation. Fixes #2867

micronaut-projects · May 1, 2020 · f4ba006 · f4ba006
1 parent 1a11892
commit f4ba006
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/inject/src/main/java/io/micronaut/context/DefaultBeanContext.java b/inject/src/main/java/io/micronaut/context/DefaultBeanContext.java
@@ -1810,9 +1810,7 @@ protected void processParallelBeans() {
  parallelBeans.forEach(beanDefinitionReference -> {
  try {
  if (isRunning()) {
- synchronized (singletonObjects) {
- loadContextScopeBean(beanDefinitionReference, parallelDefinitions::add);
- }
+ loadContextScopeBean(beanDefinitionReference, parallelDefinitions::add);
  }
  } catch (Throwable e) {
  LOG.error("Parallel Bean definition [" + beanDefinitionReference.getName() + "] could not be loaded: " + e.getMessage(), e);
@@ -1829,9 +1827,7 @@ protected void processParallelBeans() {
  parallelDefinitions.forEach(beanDefinition -> ForkJoinPool.commonPool().execute(() -> {
  try {
  if (isRunning()) {
- synchronized (singletonObjects) {
- loadContextScopeBean(beanDefinition);
- }
+ loadContextScopeBean(beanDefinition);
  }
  } catch (Throwable e) {
  LOG.error("Parallel Bean definition [" + beanDefinition.getName() + "] could not be loaded: " + e.getMessage(), e);
@@ -1991,7 +1987,7 @@ private void loadContextScopeBean(BeanDefinition beanDefinition) {
 
  } else {
  try (BeanResolutionContext resolutionContext = newResolutionContext(beanDefinition, null)) {
- createAndRegisterSingletonInternal(resolutionContext, beanDefinition, beanDefinition.getBeanType(), null);
+ createAndRegisterSingleton(resolutionContext, beanDefinition, beanDefinition.getBeanType(), null);
  }
  }
  }