Merge branch '1.2.x'

9 years ago · 3800729d0d
parent 817111c6d3 5043c959a2
commit 3800729d0d
1 changed files with 1 additions and 1 deletions
--- a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
+++ b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
@ -877,7 +877,7 @@ public class SpringApplication {
 	public void setApplicationContextClass(
 			Class<? extends ConfigurableApplicationContext> applicationContextClass) {
 		this.applicationContextClass = applicationContextClass;
-		if (isSpringWebAvailable() && !WebApplicationContext.class.isAssignableFrom(
+		if (!isSpringWebAvailable() || !WebApplicationContext.class.isAssignableFrom(
 				applicationContextClass)) {
 			this.webEnvironment = false;
 		}