Skip to content

Commit

Permalink
Perform setParent's Environment merging for ClassPathXmlApplicationCo…
Browse files Browse the repository at this point in the history
…ntext etc constructors with parent argument as well

Issue: SPR-11068
(cherry picked from commit c5fcf19)
  • Loading branch information
jhoeller committed Nov 5, 2013
1 parent 70907fd commit 863570a
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -217,16 +217,16 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
* Create a new AbstractApplicationContext with no parent.
*/
public AbstractApplicationContext() {
this(null);
this.resourcePatternResolver = getResourcePatternResolver();
}

/**
* Create a new AbstractApplicationContext with the given parent context.
* @param parent the parent context
*/
public AbstractApplicationContext(ApplicationContext parent) {
this.parent = parent;
this.resourcePatternResolver = getResourcePatternResolver();
this();
setParent(parent);
}


Expand Down

0 comments on commit 863570a

Please sign in to comment.