Avoid NPE in ContextLoader when dealing with an untyped ApplicationContextInitializer

jhoeller · jhoeller · commit a19c976f7f2e · 2013-05-16T16:09:54.000+02:00
Issue: SPR-10449
diff --git a/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java b/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java
@@ -470,7 +470,6 @@ protected Class<?> determineContextClass(ServletContext servletContext) {
 	protected void customizeContext(ServletContext servletContext, ConfigurableWebApplicationContext applicationContext) {
 		List<Class<ApplicationContextInitializer<ConfigurableApplicationContext>>> initializerClasses =
 				determineContextInitializerClasses(servletContext);
-
 		if (initializerClasses.size() == 0) {
 			// no ApplicationContextInitializers have been declared -> nothing to do
 			return;
@@ -483,11 +482,13 @@ protected void customizeContext(ServletContext servletContext, ConfigurableWebAp
 		for (Class<ApplicationContextInitializer<ConfigurableApplicationContext>> initializerClass : initializerClasses) {
 			Class<?> initializerContextClass =
 					GenericTypeResolver.resolveTypeArgument(initializerClass, ApplicationContextInitializer.class);
-			Assert.isAssignable(initializerContextClass, contextClass, String.format(
-					"Could not add context initializer [%s] as its generic parameter [%s] " +
-					"is not assignable from the type of application context used by this " +
-					"context loader [%s]: ", initializerClass.getName(), initializerContextClass.getName(),
-					contextClass.getName()));
+			if (initializerContextClass != null) {
+				Assert.isAssignable(initializerContextClass, contextClass, String.format(
+						"Could not add context initializer [%s] as its generic parameter [%s] " +
+						"is not assignable from the type of application context used by this " +
+						"context loader [%s]: ", initializerClass.getName(), initializerContextClass.getName(),
+						contextClass.getName()));
+			}
 			initializerInstances.add(BeanUtils.instantiateClass(initializerClass));
 		}
 
