Perform setParent's Environment merging for ClassPathXmlApplicationContext etc constructors with parent argument as well

Issue: SPR-11068
This commit is contained in:
Juergen Hoeller 2013-11-05 13:48:21 +01:00
parent 4ac680103b
commit c5fcf19535
1 changed files with 3 additions and 3 deletions

View File

@ -206,7 +206,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
* Create a new AbstractApplicationContext with no parent.
*/
public AbstractApplicationContext() {
this(null);
this.resourcePatternResolver = getResourcePatternResolver();
}
/**
@ -214,8 +214,8 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
* @param parent the parent context
*/
public AbstractApplicationContext(ApplicationContext parent) {
this.parent = parent;
this.resourcePatternResolver = getResourcePatternResolver();
this();
setParent(parent);
}