spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-10-02 12:39:14 +00:00
Code Issues Projects Releases Wiki Activity

Prevent NPE in SpringServletContainerInitializer

Browse Source 
Issue: SPR-8496

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4639 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Chris Beams
2011-06-29 17:33:07 +00:00
parent 09197872e9
commit 39d8015752
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
org.springframework.web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
+6 -4
View File
@@ -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));
}
}
}