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/07 17:05:36 UTC
svn commit: r1067994 - in
/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra:
net/MessagingService.java utils/ExpiringMap.java
Author: jbellis
Date: Mon Feb 7 16:05:35 2011
New Revision: 1067994
URL: http://svn.apache.org/viewvc?rev=1067994&view=rev
Log:
backport assertion from #2081 patch 2
Modified:
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/MessagingService.java
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/ExpiringMap.java
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/MessagingService.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/MessagingService.java?rev=1067994&r1=1067993&r2=1067994&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/MessagingService.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/MessagingService.java Mon Feb 7 16:05:35 2011
@@ -237,7 +237,8 @@ public class MessagingService
private void addCallback(IMessageCallback cb, String messageId, InetAddress to)
{
- callbacks.put(messageId, new Pair<InetAddress, IMessageCallback>(to, cb));
+ Pair<InetAddress, IMessageCallback> previous = callbacks.put(messageId, new Pair<InetAddress, IMessageCallback>(to, cb));
+ assert previous == null;
}
/**
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/ExpiringMap.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/ExpiringMap.java?rev=1067994&r1=1067993&r2=1067994&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/ExpiringMap.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/ExpiringMap.java Mon Feb 7 16:05:35 2011
@@ -107,9 +107,10 @@ public class ExpiringMap<K, V>
timer.cancel();
}
- public void put(K key, V value)
+ public V put(K key, V value)
{
- cache.put(key, new CacheableObject<V>(value));
+ CacheableObject<V> previous = cache.put(key, new CacheableObject<V>(value));
+ return (previous == null) ? null : previous.getValue();
}
public V get(K key)