Merge pull request #14845 from ranarula

philwebb · philwebb · commit 16579453409d · 2018-10-15T22:05:54.000-07:00
* pr/14845:
  Polish SpringBootJoranConfigurator
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringBootJoranConfigurator.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringBootJoranConfigurator.java
@@ -45,7 +45,7 @@ public void addInstanceRules(RuleStore rs) {
 		rs.addRule(new ElementSelector("configuration/springProperty"),
 				new SpringPropertyAction(environment));
 		rs.addRule(new ElementSelector("*/springProfile"),
-				new SpringProfileAction(this.initializationContext.getEnvironment()));
+				new SpringProfileAction(environment));
 		rs.addRule(new ElementSelector("*/springProfile/*"), new NOPAction());
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public void addInstanceRules(RuleStore rs) {`
`45`	`45`	`rs.addRule(new ElementSelector("configuration/springProperty"),`
`46`	`46`	`new SpringPropertyAction(environment));`
`47`	`47`	`rs.addRule(new ElementSelector("*/springProfile"),`
`48`		`- new SpringProfileAction(this.initializationContext.getEnvironment()));`
	`48`	`+ new SpringProfileAction(environment));`
`49`	`49`	`rs.addRule(new ElementSelector("/springProfile/"), new NOPAction());`
`50`	`50`	`}`
`51`	`51`