[jbosscache-commits] JBoss Cache SVN: r8366 - core/trunk/src/main/java/org/jboss/cache/eviction.

[jbosscache-commits at lists.jboss.org]

Author: dereed
Date: 2010-04-09 18:54:22 -0400 (Fri, 09 Apr 2010)
New Revision: 8366

Modified:
   core/trunk/src/main/java/org/jboss/cache/eviction/ExpirationAlgorithm.java
Log:
[JBCACHE-1575] Remove spurious WARN message from ExpirationAlgorithm when node is removed soon after being updated


Modified: core/trunk/src/main/java/org/jboss/cache/eviction/ExpirationAlgorithm.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/eviction/ExpirationAlgorithm.java	2010-04-09 22:53:15 UTC (rev 8365)
+++ core/trunk/src/main/java/org/jboss/cache/eviction/ExpirationAlgorithm.java	2010-04-09 22:54:22 UTC (rev 8366)
@@ -98,14 +98,14 @@
    private void addEvictionEntry(Fqn fqn)
    {
       Long l = getExpiration(fqn);
-      if (l == null)
+      if (l == -1)
       {
          if (config.isWarnNoExpirationKey() && log.isWarnEnabled())
             log.warn("No expiration key '" + config.getExpirationKeyName() + "' for Node: " + fqn);
          else if (log.isDebugEnabled())
             log.debug("No expiration key for Node: " + fqn);
       }
-      else
+      else if (l != null)
       {
          setExpiration(fqn, l);
       }
@@ -125,7 +125,10 @@
       NodeSPI n = cache.peek(fqn, false);
       if (n == null)
          return null;
-      return (Long) n.getDirect(config.getExpirationKeyName());
+      Long expiration = (Long) n.getDirect(config.getExpirationKeyName());
+      if ( expiration == null )
+         return -1L;
+      return expiration;
    }
 
    @Override
@@ -179,7 +182,7 @@
       {
          ExpirationEntry ee = i.next();
          Long ce = getExpiration(ee.getFqn());
-         if (ce == null || ce > ee.getExpiration())
+         if (ce == null || ce == -1 || ce > ee.getExpiration())
          {
             // Expiration now older
             i.remove();