Browse Source

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

Issue: SPR-11068
pull/403/merge
Juergen Hoeller 12 years ago
parent
commit
c5fcf19535
  1. 6
      spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java

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

@ -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);
} }

Loading…
Cancel
Save