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

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

Author: bstansberry at jboss.com
Date: 2007-11-18 22:21:30 -0500 (Sun, 18 Nov 2007)
New Revision: 67238

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java
Log:
Handle null snapshotInterval

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java	2007-11-19 00:34:47 UTC (rev 67237)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java	2007-11-19 03:21:30 UTC (rev 67238)
@@ -178,7 +178,8 @@
       Boolean batch = repCfg.getReplicationFieldBatchMode();
       this.replicationFieldBatchMode_ = (batch == null ? Boolean.TRUE : batch);
       setSnapshotMode(repCfg.getSnapshotMode());
-      setSnapshotInterval(repCfg.getSnapshotInterval()); 
+      Integer snapshotInt = repCfg.getSnapshotInterval();
+      setSnapshotInterval(snapshotInt == null ? 0 : snapshotInt.intValue()); 
       
       log_.debug("init(): replicationGranularity_ is " + replicationGranularity_ +
          " and replicationFieldBatchMode is " + replicationFieldBatchMode_ +
@@ -2027,6 +2028,13 @@
       {
          throw new IllegalStateException("Property snapshotMode must be " + SnapshotMode.INTERVAL + " when FIELD granularity is used");
       }
+      else if (snapshotInterval_ < 1)
+      {
+         log_.warn("Snapshot mode set to 'interval' but snapshotInterval is < 1 " +
+                   "using 'instant'");
+         snapshotMode_ = SnapshotMode.INSTANT;
+         snapshotManager_ = new InstantSnapshotManager(this, ctxPath);         
+      }
       else
       {
          snapshotManager_ = new IntervalSnapshotManager(this, ctxPath, snapshotInterval_);