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

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

Author: adrian at jboss.org
Date: 2007-11-12 07:47:52 -0500 (Mon, 12 Nov 2007)
New Revision: 66955

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
Log:
[JBAS-4960] - Fix the NPE in the merge

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java	2007-11-12 12:36:32 UTC (rev 66954)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java	2007-11-12 12:47:52 UTC (rev 66955)
@@ -1048,7 +1048,7 @@
       if(override != null && override.arbitraryMetadata!= null)
          setArbitraryMetadata(override.arbitraryMetadata);
       
-      if(override != null && override.maxActiveSessions != -1)
+      if(override != null && override.maxActiveSessions != null && override.maxActiveSessions != -1)
          setMaxActiveSession(override.maxActiveSessions);
       
       if(override != null && override.sessionCookies != -1)