Merge branch '1.1.x'

2014-09-19 16:12:38 +01:00
parent 2dbe4d706b d6165d97dd
commit b06d10ddb0
3 changed files with 8 additions and 7 deletions
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnWebApplicationCondition.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnWebApplicationCondition.java
@@ -77,6 +77,11 @@ class OnWebApplicationCondition extends SpringBootCondition {
 					.match("found web application StandardServletEnvironment");
 		}

+		if (context.getResourceLoader() instanceof WebApplicationContext) {
+			return ConditionOutcome
+					.match("found web application WebApplicationContext");
+		}
+
 		return ConditionOutcome.noMatch("not a web application");
 	}