Merge branch '1.1.x'

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java

@@ -106,26 +106,24 @@ public class OnBeanCondition extends SpringBootCondition implements
 					"Unable to use SearchStrategy.PARENTS");
 			beanFactory = (ConfigurableListableBeanFactory) parent;
 		}
-
+		if (beanFactory == null) {
+			return Collections.emptyList();
+		}
 		List<String> beanNames = new ArrayList<String>();
 		boolean considerHierarchy = beans.getStrategy() == SearchStrategy.ALL;
-
 		for (String type : beans.getTypes()) {
 			beanNames.addAll(getBeanNamesForType(beanFactory, type,
 					context.getClassLoader(), considerHierarchy));
 		}
-
 		for (String annotation : beans.getAnnotations()) {
 			beanNames.addAll(Arrays.asList(getBeanNamesForAnnotation(beanFactory,
 					annotation, context.getClassLoader(), considerHierarchy)));
 		}
-
 		for (String beanName : beans.getNames()) {
 			if (containsBean(beanFactory, beanName, considerHierarchy)) {
 				beanNames.add(beanName);
 			}
 		}
-
 		return beanNames;
 	}