|
|
|
|
@ -1,5 +1,5 @@
@@ -1,5 +1,5 @@
|
|
|
|
|
/* |
|
|
|
|
* Copyright 2002-2019 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. |
|
|
|
|
@ -1280,7 +1280,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
@@ -1280,7 +1280,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
|
|
|
|
|
else { |
|
|
|
|
throw new NoSuchBeanDefinitionException(parentBeanName, |
|
|
|
|
"Parent name '" + parentBeanName + "' is equal to bean name '" + beanName + |
|
|
|
|
"': cannot be resolved without an AbstractBeanFactory parent"); |
|
|
|
|
"': cannot be resolved without a ConfigurableBeanFactory parent"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
@ -1295,7 +1295,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
@@ -1295,7 +1295,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
|
|
|
|
|
|
|
|
|
|
// Set default singleton scope, if not configured before.
|
|
|
|
|
if (!StringUtils.hasLength(mbd.getScope())) { |
|
|
|
|
mbd.setScope(RootBeanDefinition.SCOPE_SINGLETON); |
|
|
|
|
mbd.setScope(SCOPE_SINGLETON); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// A bean contained in a non-singleton bean cannot be a singleton itself.
|
|
|
|
|
|