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 E74C41121D for ; Sat, 14 Jun 2014 05:31:11 +0000 (UTC) Received: (qmail 76851 invoked by uid 500); 14 Jun 2014 05:31:10 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 76818 invoked by uid 500); 14 Jun 2014 05:31:10 -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 76808 invoked by uid 99); 14 Jun 2014 05:31:10 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Jun 2014 05:31:10 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6D151934983; Sat, 14 Jun 2014 05:31:09 +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 Message-Id: <266050a372e94ef4ab2d6ca29f5d4e1c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: don't rely on toString being a stable implementation, where possible Date: Sat, 14 Jun 2014 05:31:09 +0000 (UTC) Repository: cassandra Updated Branches: refs/heads/trunk 8ff5262f0 -> 45afe1d93 don't rely on toString being a stable implementation, where possible Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/45afe1d9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45afe1d9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/45afe1d9 Branch: refs/heads/trunk Commit: 45afe1d935be9057fe3aa08f2d7b9300501402ff Parents: 8ff5262 Author: Dave Brosius Authored: Sat Jun 14 01:29:58 2014 -0400 Committer: Dave Brosius Committed: Sat Jun 14 01:29:58 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/45afe1d9/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java index e2d9248..ae191f0 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -463,7 +463,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean { public boolean accept(File pathname) { - return pathname.toString().endsWith(StreamLockfile.FILE_EXT); + return pathname.getPath().endsWith(StreamLockfile.FILE_EXT); } }; for (File dir : directories.getCFDirectories())