Skip to content

S
spring-boot
Commit 3800729d authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge branch '1.2.x'

parents 817111c6 5043c959
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
View file @ 3800729d
...@@ -877,7 +877,7 @@ public class SpringApplication { ...@@ -877,7 +877,7 @@ public class SpringApplication {
public void setApplicationContextClass( public void setApplicationContextClass(
Class<? extends ConfigurableApplicationContext> applicationContextClass) { Class<? extends ConfigurableApplicationContext> applicationContextClass) {
this.applicationContextClass = applicationContextClass; this.applicationContextClass = applicationContextClass;
if (isSpringWebAvailable() && !WebApplicationContext.class.isAssignableFrom( if (!isSpringWebAvailable() || !WebApplicationContext.class.isAssignableFrom(
applicationContextClass)) { applicationContextClass)) {
this.webEnvironment = false; this.webEnvironment = false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment