[jboss-cvs] JBossAS SVN: r66673 - projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss.

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

Author: scott.stark at jboss.org
Date: 2007-11-02 04:10:31 -0400 (Fri, 02 Nov 2007)
New Revision: 66673

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossServletsMetaData.java
Log:
Validate the original for null

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossServletsMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossServletsMetaData.java	2007-11-02 07:57:00 UTC (rev 66672)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossServletsMetaData.java	2007-11-02 08:10:31 UTC (rev 66673)
@@ -42,22 +42,25 @@
       JBossServletsMetaData merged = new JBossServletsMetaData();
       if (override == null && original == null)
          return merged;
-      
-      for(ServletMetaData smd : original)
+
+      if(original != null)
       {
-         String key = smd.getKey();
-         if(override != null && override.containsKey(key))
+         for(ServletMetaData smd : original)
          {
-            JBossServletMetaData overrideSMD = override.get(key);
-            JBossServletMetaData jbs = overrideSMD.merge(smd);
-            merged.add(jbs);
+            String key = smd.getKey();
+            if(override != null && override.containsKey(key))
+            {
+               JBossServletMetaData overrideSMD = override.get(key);
+               JBossServletMetaData jbs = overrideSMD.merge(smd);
+               merged.add(jbs);
+            }
+            else
+            {
+               JBossServletMetaData jbs = new JBossServletMetaData();
+               jbs.merge(null, smd);
+               merged.add(jbs);
+            }
          }
-         else
-         {
-            JBossServletMetaData jbs = new JBossServletMetaData();
-            jbs.merge(null, smd);
-            merged.add(jbs);
-         }
       }
       
       // Process the remaining overrides