Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 84832DC03 for ; Mon, 3 Sep 2012 16:20:04 +0000 (UTC) Received: (qmail 19863 invoked by uid 500); 3 Sep 2012 16:20:04 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 19831 invoked by uid 500); 3 Sep 2012 16:20:04 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 19817 invoked by uid 99); 3 Sep 2012 16:20:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Sep 2012 16:20:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DC82E24788; Mon, 3 Sep 2012 16:20:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbrosius@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: fix build Message-Id: <20120903162003.DC82E24788@tyr.zones.apache.org> Date: Mon, 3 Sep 2012 16:20:03 +0000 (UTC) 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 Authored: Mon Sep 3 12:18:12 2012 -0400 Committer: Dave Brosius 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 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;