[jboss-cvs] JBossAS SVN: r95174 - trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers.

[jboss-cvs-commits at lists.jboss.org]

Author: remy.maucherat at jboss.com
Date: 2009-10-20 10:50:11 -0400 (Tue, 20 Oct 2009)
New Revision: 95174

Modified:
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
Log:
- Fix NPE processing property groups.

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2009-10-20 14:49:24 UTC (rev 95173)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2009-10-20 14:50:11 UTC (rev 95174)
@@ -495,13 +495,19 @@
                jspPropertyGroup.setPageEncoding(group.getPageEncoding());
                jspPropertyGroup.setScriptingInvalid(group.getScriptingInvalid());
                jspPropertyGroup.setIsXml(group.getIsXml());
-               for (String includePrelude : group.getIncludePreludes())
+               if (group.getIncludePreludes() != null)
                {
-                  jspPropertyGroup.addIncludePrelude(includePrelude);
+                  for (String includePrelude : group.getIncludePreludes())
+                  {
+                     jspPropertyGroup.addIncludePrelude(includePrelude);
+                  }
                }
-               for (String includeCoda : group.getIncludeCodas())
+               if (group.getIncludeCodas() != null)
                {
-                  jspPropertyGroup.addIncludeCoda(includeCoda);
+                  for (String includeCoda : group.getIncludeCodas())
+                  {
+                     jspPropertyGroup.addIncludeCoda(includeCoda);
+                  }
                }
                jspPropertyGroup.setDeferredSyntaxAllowedAsLiteral(group.getDeferredSyntaxAllowedAsLiteral());
                jspPropertyGroup.setTrimDirectiveWhitespaces(group.getTrimDirectiveWhitespaces());