Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.2.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2015-09-01 18:40:06 +02:00
parent 817111c6d3 5043c959a2
commit 3800729d0d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
View File

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