[jboss-cvs] JBossAS SVN: r109355 - in projects/cluster/ha-server-cache-ispn/trunk/src: test/java/org/jboss/web/tomcat/service/session/distributedcache/ispn and 1 other directory.

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

Author: pferraro
Date: 2010-11-17 12:30:21 -0500 (Wed, 17 Nov 2010)
New Revision: 109355

Modified:
   projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/SessionAttributeStorageFactoryImpl.java
   projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/SessionAttributeStorageFactoryTest.java
Log:
If FIELD granularity was requested, fallback to SESSION instead of throwing IllegalArgumentException.

Modified: projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/SessionAttributeStorageFactoryImpl.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/SessionAttributeStorageFactoryImpl.java	2010-11-17 16:58:57 UTC (rev 109354)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/SessionAttributeStorageFactoryImpl.java	2010-11-17 17:30:21 UTC (rev 109355)
@@ -21,6 +21,7 @@
  */
 package org.jboss.web.tomcat.service.session.distributedcache.ispn;
 
+import org.jboss.logging.Logger;
 import org.jboss.metadata.web.jboss.ReplicationGranularity;
 import org.jboss.web.tomcat.service.session.distributedcache.spi.OutgoingDistributableSessionData;
 import org.jboss.web.tomcat.service.session.distributedcache.spi.SessionAttributeMarshaller;
@@ -31,6 +32,8 @@
  */
 public class SessionAttributeStorageFactoryImpl implements SessionAttributeStorageFactory
 {
+   private static Logger log = Logger.getLogger(SessionAttributeStorageFactoryImpl.class);
+   
    /**
     * {@inheritDoc}
     * @see org.jboss.web.tomcat.service.session.distributedcache.ispn.SessionAttributeStorageFactory#createStorage(org.jboss.metadata.web.jboss.ReplicationGranularity, org.jboss.web.tomcat.service.session.distributedcache.spi.SessionAttributeMarshaller)
@@ -51,7 +54,8 @@
          }
          case FIELD:
          {
-            throw new IllegalArgumentException("FIELD replication granularity is no longer supported, use SESSION or ATTRIBUTE instead.");
+            log.warn("FIELD replication granularity is deprecated.  Falling back to SESSION granularity instead.");
+            return this.createStorage(ReplicationGranularity.SESSION, marshaller);
          }
          default:
          {

Modified: projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/SessionAttributeStorageFactoryTest.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/SessionAttributeStorageFactoryTest.java	2010-11-17 16:58:57 UTC (rev 109354)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/SessionAttributeStorageFactoryTest.java	2010-11-17 17:30:21 UTC (rev 109355)
@@ -53,7 +53,7 @@
    @Test
    public void testField()
    {
-      this.test(ReplicationGranularity.FIELD, null);
+      this.test(ReplicationGranularity.FIELD, CoarseSessionAttributeStorage.class);
    }
    
    private void test(ReplicationGranularity granularity, Class<? extends SessionAttributeStorage<?>> expectedClass)