You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2011/02/08 01:52:27 UTC
svn commit: r1068241 -
/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ExpiringMap.java
Author: jbellis
Date: Tue Feb 8 00:52:26 2011
New Revision: 1068241
URL: http://svn.apache.org/viewvc?rev=1068241&view=rev
Log:
only call postExpireHook when not null
patch by jbellis
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ExpiringMap.java
Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ExpiringMap.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ExpiringMap.java?rev=1068241&r1=1068240&r2=1068241&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ExpiringMap.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ExpiringMap.java Tue Feb 8 00:52:26 2011
@@ -72,7 +72,8 @@ public class ExpiringMap<K, V>
if (entry.getValue().isReadyToDie(expiration))
{
cache.remove(entry.getKey());
- postExpireHook.apply(new Pair<K, V>(entry.getKey(), entry.getValue().getValue()));
+ if (postExpireHook != null)
+ postExpireHook.apply(new Pair<K, V>(entry.getKey(), entry.getValue().getValue()));
}
}
}