[jboss-cvs] JBossCache/src/org/jboss/cache/interceptors ...

[Manik Surtani]

  User: msurtani
  Date: 06/11/15 10:16:40

  Modified:    src/org/jboss/cache/interceptors  EvictionInterceptor.java
  Log:
  Updated to fix failures after patching up region managers
  
  Revision  Changes    Path
  1.9       +5 -3      JBossCache/src/org/jboss/cache/interceptors/EvictionInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EvictionInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/EvictionInterceptor.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- EvictionInterceptor.java	14 Nov 2006 14:17:12 -0000	1.8
  +++ EvictionInterceptor.java	15 Nov 2006 15:16:40 -0000	1.9
  @@ -27,7 +27,7 @@
    * This interceptor is used to handle eviction events.
    *
    * @author Daniel Huang
  - * @version $Revision: 1.8 $
  + * @version $Revision: 1.9 $
    */
   public class EvictionInterceptor extends Interceptor
   {
  @@ -134,12 +134,14 @@
   
      protected boolean canIgnoreEvent(Fqn fqn, NodeEventType type)
      {
  -      return regionManager.getRegion(fqn, true).getEvictionPolicy().canIgnoreEvent(fqn, type);
  +      Region r = regionManager.getRegion(fqn, false);
  +      if (r == null) return true; // should never happen, we should at least get the default region.
  +      return regionManager.getRegion(fqn, false).getEvictionPolicy().canIgnoreEvent(fqn, type);
      }
   
      protected void doEventUpdatesOnRegionManager(EvictedEventNode event)
      {
  -      Region region = regionManager.getRegion(event.getFqn(), true);
  +      Region region = regionManager.getRegion(event.getFqn(), false);
         region.putNodeEvent(event);
   
         if (log.isTraceEnabled())