Updated Branches: refs/heads/trunk f17fbac19 -> 71a50b73d
inline Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/71a50b73 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71a50b73 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71a50b73 Branch: refs/heads/trunk Commit: 71a50b73d274a4878feb5446ee79275118a87560 Parents: f422b98 Author: Jonathan Ellis <[email protected]> Authored: Fri Jun 22 12:32:22 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Jun 22 12:33:53 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/net/MessagingService.java | 2 +- .../org/apache/cassandra/utils/ExpiringMap.java | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/71a50b73/src/java/org/apache/cassandra/net/MessagingService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java index e4e59cb..2966801 100644 --- a/src/java/org/apache/cassandra/net/MessagingService.java +++ b/src/java/org/apache/cassandra/net/MessagingService.java @@ -322,7 +322,7 @@ public final class MessagingService implements MessagingServiceMBean { public Object apply(Pair<String, ExpiringMap.CacheableObject<CallbackInfo>> pair) { - CallbackInfo expiredCallbackInfo = pair.right.getValue(); + CallbackInfo expiredCallbackInfo = pair.right.value; maybeAddLatency(expiredCallbackInfo.callback, expiredCallbackInfo.target, (double) pair.right.timeout); totalTimeouts++; String ip = expiredCallbackInfo.target.getHostAddress(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/71a50b73/src/java/org/apache/cassandra/utils/ExpiringMap.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/ExpiringMap.java b/src/java/org/apache/cassandra/utils/ExpiringMap.java index 9b34bb8..d561fc9 100644 --- a/src/java/org/apache/cassandra/utils/ExpiringMap.java +++ b/src/java/org/apache/cassandra/utils/ExpiringMap.java @@ -36,9 +36,9 @@ public class ExpiringMap<K, V> public static class CacheableObject<T> { - private final T value; - private final long createdAt; + public final T value; public final long timeout; + private final long createdAt; private CacheableObject(T value, long timeout) { @@ -48,11 +48,6 @@ public class ExpiringMap<K, V> this.createdAt = System.currentTimeMillis(); } - public T getValue() - { - return value; - } - private boolean isReadyToDieAt(long time) { return ((time - createdAt) > timeout); @@ -147,19 +142,19 @@ public class ExpiringMap<K, V> } } CacheableObject<V> previous = cache.put(key, new CacheableObject<V>(value, timeout)); - return (previous == null) ? null : previous.getValue(); + return (previous == null) ? null : previous.value; } public V get(K key) { CacheableObject<V> co = cache.get(key); - return co == null ? null : co.getValue(); + return co == null ? null : co.value; } public V remove(K key) { CacheableObject<V> co = cache.remove(key); - return co == null ? null : co.getValue(); + return co == null ? null : co.value; } public long getAge(K key)
