[jbosscache-commits] JBoss Cache SVN: r4668 - in core/trunk/src/main/java/org/jboss/cache: eviction and 1 other directory.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2007-10-23 05:06:30 -0400 (Tue, 23 Oct 2007)
New Revision: 4668

Modified:
   core/trunk/src/main/java/org/jboss/cache/RegionImpl.java
   core/trunk/src/main/java/org/jboss/cache/eviction/BaseEvictionAlgorithm.java
Log:
Null check for unit tests that don't completely initialise region managers when testing eviction algorithms, etc.

Modified: core/trunk/src/main/java/org/jboss/cache/RegionImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/RegionImpl.java	2007-10-23 08:53:16 UTC (rev 4667)
+++ core/trunk/src/main/java/org/jboss/cache/RegionImpl.java	2007-10-23 09:06:30 UTC (rev 4668)
@@ -61,7 +61,10 @@
 
    public Configuration getCacheConfiguration()
    {
-      return regionManager.getCache().getConfiguration();
+      if (regionManager!= null && regionManager.getCache() != null)
+         return regionManager.getCache().getConfiguration();
+      else
+         return null;
    }
 
    public void registerContextClassLoader(ClassLoader classLoader)

Modified: core/trunk/src/main/java/org/jboss/cache/eviction/BaseEvictionAlgorithm.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/eviction/BaseEvictionAlgorithm.java	2007-10-23 08:53:16 UTC (rev 4667)
+++ core/trunk/src/main/java/org/jboss/cache/eviction/BaseEvictionAlgorithm.java	2007-10-23 09:06:30 UTC (rev 4668)
@@ -78,8 +78,9 @@
       evictionQueue = setupEvictionQueue(region);
       log.debug("initialized: " + this);
       // hacky temp solution till we have an ioc fwk to inject configuration elements as needed
-      Configuration.CacheMode cm = region.getCacheConfiguration().getCacheMode();
-      allowTombstones = region.getCacheConfiguration().isNodeLockingOptimistic() &&
+      Configuration c = region.getCacheConfiguration();
+      Configuration.CacheMode cm = c != null ? c.getCacheMode() : Configuration.CacheMode.LOCAL;
+      allowTombstones = c != null && c.isNodeLockingOptimistic() &&
                         (cm == Configuration.CacheMode.INVALIDATION_ASYNC || cm == Configuration.CacheMode.INVALIDATION_SYNC);
    }