Browse Source

Prevent NPE in SpringServletContainerInitializer

Issue: SPR-8496

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4639 50f2f4bb-b051-0410-bef5-90022cba6387
pull/1/merge
Chris Beams 15 years ago
parent
commit
39d8015752
  1. 10
      org.springframework.web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java

10
org.springframework.web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java

@ -139,10 +139,12 @@ public class SpringServletContainerInitializer implements ServletContainerInitia @@ -139,10 +139,12 @@ public class SpringServletContainerInitializer implements ServletContainerInitia
ArrayList<WebApplicationInitializer> initializers = new ArrayList<WebApplicationInitializer>();
for (Class<?> waiClass : webAppInitializerClasses) {
if (!Modifier.isAbstract(waiClass.getModifiers())) {
// the class can be instantiated -> add it
initializers.add(instantiateClass(waiClass, WebApplicationInitializer.class));
if (webAppInitializerClasses != null) {
for (Class<?> waiClass : webAppInitializerClasses) {
if (!Modifier.isAbstract(waiClass.getModifiers())) {
// the class can be instantiated -> add it
initializers.add(instantiateClass(waiClass, WebApplicationInitializer.class));
}
}
}

Loading…
Cancel
Save