Updated Branches: refs/heads/trunk ae6a58fd7 -> 84b25f0b0
fix build Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/84b25f0b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/84b25f0b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/84b25f0b Branch: refs/heads/trunk Commit: 84b25f0b097ec2480e8805bb2c4f8d7e93ebe737 Parents: ae6a58f Author: Dave Brosius <[email protected]> Authored: Mon Sep 3 12:18:12 2012 -0400 Committer: Dave Brosius <[email protected]> Committed: Mon Sep 3 12:18:12 2012 -0400 ---------------------------------------------------------------------- .../org/apache/cassandra/service/CacheService.java | 2 +- src/java/org/apache/cassandra/utils/Pair.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/84b25f0b/src/java/org/apache/cassandra/service/CacheService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/CacheService.java b/src/java/org/apache/cassandra/service/CacheService.java index 2342cac..ee39406 100644 --- a/src/java/org/apache/cassandra/service/CacheService.java +++ b/src/java/org/apache/cassandra/service/CacheService.java @@ -331,7 +331,7 @@ public class CacheService implements CacheServiceMBean { DecoratedKey key = cfs.partitioner.decorateKey(buffer); ColumnFamily data = cfs.getTopLevelColumns(QueryFilter.getIdentityFilter(key, new QueryPath(cfs.columnFamily)), Integer.MIN_VALUE, true); - return Pair.create(new RowCacheKey(cfs.metadata.cfId, key), data); + return Pair.create(new RowCacheKey(cfs.metadata.cfId, key), (IRowCacheEntry) data); } }); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/84b25f0b/src/java/org/apache/cassandra/utils/Pair.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/Pair.java b/src/java/org/apache/cassandra/utils/Pair.java index c654176..a14a9b8 100644 --- a/src/java/org/apache/cassandra/utils/Pair.java +++ b/src/java/org/apache/cassandra/utils/Pair.java @@ -24,7 +24,7 @@ public class Pair<T1, T2> public final T1 left; public final T2 right; - private Pair(T1 left, T2 right) + public Pair(T1 left, T2 right) { this.left = left; this.right = right;
