[jboss-cvs] JBossAS SVN: r68213 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/session.

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

Author: bstansberry at jboss.com
Date: 2007-12-12 20:03:25 -0500 (Wed, 12 Dec 2007)
New Revision: 68213

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossManager.java
Log:
Avoid NPEs when reading config

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossManager.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossManager.java	2007-12-13 00:06:53 UTC (rev 68212)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossManager.java	2007-12-13 01:03:25 UTC (rev 68213)
@@ -207,15 +207,18 @@
       PassivationConfig pConfig = webMetaData.getPassivationConfig();
       if (pConfig != null)
       {
-         passivationMode_ = pConfig.getUseSessionPassivation().booleanValue();
-         if (passivationMode_)
+         if (pConfig.getUseSessionPassivation() != null)
          {
-            Integer min = pConfig.getPassivationMinIdleTime();
-            if (min != null)
-               passivationMinIdleTime_ = min.intValue();
-            Integer max = pConfig.getPassivationMaxIdleTime();
-            if (max != null)
-               passivationMaxIdleTime_ = max.intValue();
+            passivationMode_ = pConfig.getUseSessionPassivation().booleanValue();
+            if (passivationMode_)
+            {
+               Integer min = pConfig.getPassivationMinIdleTime();
+               if (min != null)
+                  passivationMinIdleTime_ = min.intValue();
+               Integer max = pConfig.getPassivationMaxIdleTime();
+               if (max != null)
+                  passivationMaxIdleTime_ = max.intValue();
+            }
          }
       }