[jboss-cvs] JBossAS SVN: r67622 - in trunk/tomcat/src/main/org/jboss/web/tomcat/service: session and 1 other directory.

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

Author: bstansberry at jboss.com
Date: 2007-11-29 14:11:11 -0500 (Thu, 29 Nov 2007)
New Revision: 67622

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/ClusteringDefaultsDeployer.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossManager.java
Log:
Avoid stupid autoboxing NPEs

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/ClusteringDefaultsDeployer.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/ClusteringDefaultsDeployer.java	2007-11-29 18:15:55 UTC (rev 67621)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/ClusteringDefaultsDeployer.java	2007-11-29 19:11:11 UTC (rev 67622)
@@ -225,11 +225,11 @@
       }
       
       if (passCfg.getUseSessionPassivation() == null)
-         passCfg.setUseSessionPassivation(this.useSessionPassivation);
+         passCfg.setUseSessionPassivation(Boolean.valueOf(this.useSessionPassivation));
       if (passCfg.getPassivationMinIdleTime() == null)
-         passCfg.setPassivationMinIdleTime(this.passivationMinIdleTime);
+         passCfg.setPassivationMinIdleTime(new Integer(this.passivationMinIdleTime));
       if (passCfg.getPassivationMinIdleTime() == null)
-         passCfg.setPassivationMaxIdleTime(this.passivationMaxIdleTime);
+         passCfg.setPassivationMaxIdleTime(new Integer(this.passivationMaxIdleTime));
    }
 
    /**
@@ -252,13 +252,13 @@
       if (repCfg.getSnapshotMode() == null)
          repCfg.setSnapshotMode(this.snapshotMode);
       if (repCfg.getSnapshotInterval() == null)
-         repCfg.setSnapshotInterval(this.snapshotInterval);
+         repCfg.setSnapshotInterval(new Integer(this.snapshotInterval));
       if (repCfg.getReplicationGranularity() == null)
          repCfg.setReplicationGranularity(this.replicationGranularity);
       if (repCfg.getReplicationTrigger() == null)
          repCfg.setReplicationTrigger(this.replicationTrigger);
       if (repCfg.getReplicationFieldBatchMode() == null)
-         repCfg.setReplicationFieldBatchMode(this.replicationFieldBatchMode);
+         repCfg.setReplicationFieldBatchMode(Boolean.valueOf(this.replicationFieldBatchMode));
    }
    
 

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-11-29 18:15:55 UTC (rev 67621)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossManager.java	2007-11-29 19:11:11 UTC (rev 67622)
@@ -199,8 +199,11 @@
       if (rpc != null)
       {         
          replicationTrigger_ = rpc.getReplicationTrigger();
+      }      
+      if (webMetaData.getMaxActiveSessions() != null)
+      {
+         maxActive_ = webMetaData.getMaxActiveSessions().intValue();
       }
-      maxActive_ = webMetaData.getMaxActiveSessions();
       PassivationConfig pConfig = webMetaData.getPassivationConfig();
       if (pConfig != null)
       {