Perform setParent's Environment merging for ClassPathXmlApplicationContext etc constructors with parent argument as well
Issue: SPR-11068
This commit is contained in:
parent
4ac680103b
commit
c5fcf19535
|
@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue