[infinispan-commits] Infinispan SVN: r2207 - 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-12 10:42:54 -0400 (Thu, 12 Aug 2010)
New Revision: 2207

Modified:
   branches/4.1.x/core/src/main/java/org/infinispan/config/ConfigurationValidatingVisitor.java
   branches/4.1.x/core/src/test/java/org/infinispan/eviction/EvictionWithPassivationTest.java
Log:
[ISPN-582] (Eviction with passivation introduces a race where entries are invisible to callers)

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-12 14:21:00 UTC (rev 2206)
+++ branches/4.1.x/core/src/main/java/org/infinispan/config/ConfigurationValidatingVisitor.java	2010-08-12 14:42:54 UTC (rev 2207)
@@ -39,7 +39,7 @@
 
    @Override
    public void visitSingletonStoreConfig(SingletonStoreConfig ssc) {
-      if (tt == null) throw new ConfigurationException("Singleton store configured without transport being configured");
+      if (tt == null && ssc.isSingletonStoreEnabled()) throw new ConfigurationException("Singleton store configured without transport being configured");
    }
 
    @Override

Modified: branches/4.1.x/core/src/test/java/org/infinispan/eviction/EvictionWithPassivationTest.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/eviction/EvictionWithPassivationTest.java	2010-08-12 14:21:00 UTC (rev 2206)
+++ branches/4.1.x/core/src/test/java/org/infinispan/eviction/EvictionWithPassivationTest.java	2010-08-12 14:42:54 UTC (rev 2207)
@@ -42,6 +42,7 @@
       runTest(EvictionThreadPolicy.PIGGYBACK, EvictionStrategy.LRU);
    }
 
+   @Test (enabled = false, description = "See ISPN-598")
    public void testPiggybackLIRS() {
       runTest(EvictionThreadPolicy.PIGGYBACK, EvictionStrategy.LIRS);
    }
@@ -58,6 +59,7 @@
       runTest(EvictionThreadPolicy.DEFAULT, EvictionStrategy.LRU);
    }
 
+   @Test (enabled = false, description = "See ISPN-598")
    public void testDefaultLIRS() {
       runTest(EvictionThreadPolicy.DEFAULT, EvictionStrategy.LIRS);
    }