root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
View File

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