[infinispan-commits] Infinispan SVN: r2248 - in branches/4.1.x/core/src: test/java/org/infinispan/eviction and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-08-18 09:57:06 -0400 (Wed, 18 Aug 2010)
New Revision: 2248

Removed:
   branches/4.1.x/core/src/test/java/org/infinispan/eviction/EvictionWithPassivationConfigurationTest.java
Modified:
   branches/4.1.x/core/src/main/java/org/infinispan/config/ConfigurationValidatingVisitor.java
Log:
[ISPN-598] (Allow LIRS + Passivation combination)

Modified: branches/4.1.x/core/src/main/java/org/infinispan/config/ConfigurationValidatingVisitor.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/config/ConfigurationValidatingVisitor.java	2010-08-18 13:08:21 UTC (rev 2247)
+++ branches/4.1.x/core/src/main/java/org/infinispan/config/ConfigurationValidatingVisitor.java	2010-08-18 13:57:06 UTC (rev 2248)
@@ -46,22 +46,8 @@
    public void visitTransportType(TransportType tt) {
       this.tt = tt;
    }
-   
-   @Override
-   public void visitEvictionType(Configuration.EvictionType bean) {
-      this.eviction = bean;
-      if (this.eviction != null && this.clmc != null) checkEvictionPassivationSettings();
-      super.visitEvictionType(bean);
-   }
 
    @Override
-   public void visitCacheLoaderManagerConfig(CacheLoaderManagerConfig bean) {
-      this.clmc = bean;
-      if (this.eviction != null && this.clmc != null) checkEvictionPassivationSettings();
-      super.visitCacheLoaderManagerConfig(bean);
-   }
-
-   @Override
    public void visitConfiguration(Configuration bean) {
       checkEagerLockingAndDld(bean);
    }
@@ -77,9 +63,4 @@
          throw new ConfigurationException("Deadlock detection cannot be used with eager locking until ISPN-596 is fixed. See https://jira.jboss.org/browse/ISPN-596");
       }
    }
-
-   private void checkEvictionPassivationSettings() {
-      if (eviction != null && clmc != null && clmc.isPassivation() && eviction.strategy == EvictionStrategy.LIRS)
-         throw new ConfigurationException("Eviction strategy LIRS cannot be used with passivation until ISPN-598 is fixed.  See https://jira.jboss.org/browse/ISPN-598");
-   }
 }

Deleted: branches/4.1.x/core/src/test/java/org/infinispan/eviction/EvictionWithPassivationConfigurationTest.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/eviction/EvictionWithPassivationConfigurationTest.java	2010-08-18 13:08:21 UTC (rev 2247)
+++ branches/4.1.x/core/src/test/java/org/infinispan/eviction/EvictionWithPassivationConfigurationTest.java	2010-08-18 13:57:06 UTC (rev 2248)
@@ -1,24 +0,0 @@
-package org.infinispan.eviction;
-
-import org.infinispan.config.CacheLoaderManagerConfig;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.ConfigurationException;
-import org.infinispan.loaders.dummy.DummyInMemoryCacheStore;
-import org.infinispan.manager.DefaultCacheManager;
-import org.infinispan.test.AbstractInfinispanTest;
-import org.testng.annotations.Test;
-
- at Test(groups = "unit", testName = "eviction.EvictionWithPassivationConfigurationTest")
-public class EvictionWithPassivationConfigurationTest extends AbstractInfinispanTest {
-
-   @Test (expectedExceptions = ConfigurationException.class)
-   public void testConfig() {
-      Configuration c = new Configuration();
-      c.setEvictionStrategy(EvictionStrategy.LIRS);
-      CacheLoaderManagerConfig clmc = new CacheLoaderManagerConfig();
-      clmc.setPassivation(true);
-      clmc.addCacheLoaderConfig(new DummyInMemoryCacheStore.Cfg());
-      c.setCacheLoaderManagerConfig(clmc);
-      new DefaultCacheManager(c);
-   }
-}