Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Issue: SPR-11068
(cherry picked from commit c5fcf19)
This commit is contained in:
Juergen Hoeller
2013-11-05 14:18:14 +01:00
parent 70907fd326
commit 863570abb7
1 changed files with 3 additions and 3 deletions
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

@@ -217,7 +217,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
* Create a new AbstractApplicationContext with no parent.
*/
public AbstractApplicationContext() {
this(null);
this.resourcePatternResolver = getResourcePatternResolver();
}
/**
@@ -225,8 +225,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);
}