Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-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 8AE35117D5 for ; Thu, 17 Jul 2014 17:50:14 +0000 (UTC) Received: (qmail 64988 invoked by uid 500); 17 Jul 2014 17:50:14 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 64947 invoked by uid 500); 17 Jul 2014 17:50:14 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 64931 invoked by uid 99); 17 Jul 2014 17:50:14 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jul 2014 17:50:14 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1A6EB8C0CC3; Thu, 17 Jul 2014 17:50:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Date: Thu, 17 Jul 2014 17:50:14 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: ACCUMULO-3003 include the dot in the rfile extension check Repository: accumulo Updated Branches: refs/heads/master 3af9e60d7 -> ff785d343 ACCUMULO-3003 include the dot in the rfile extension check Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5681c40f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5681c40f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5681c40f Branch: refs/heads/master Commit: 5681c40fa2ceb9b3500eb165d2cdc0ca787a86c7 Parents: fc92b25 Author: Eric C. Newton Authored: Thu Jul 17 13:48:33 2014 -0400 Committer: Eric C. Newton Committed: Thu Jul 17 13:48:33 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/server/fs/VolumeManagerImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/5681c40f/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java index 6e8439f..0cfb457 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java +++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java @@ -528,6 +528,8 @@ public class VolumeManagerImpl implements VolumeManager { return getFullPath(FileType.TABLE, path); } + private static final String RFILE_SUFFIX = "." + RFile.EXTENSION; + @Override public Path getFullPath(FileType fileType, String path) { int colon = path.indexOf(':'); @@ -550,7 +552,7 @@ public class VolumeManagerImpl implements VolumeManager { String[] pathComponents = StringUtils.split(path, Path.SEPARATOR_CHAR); // Is an rfile - if (path.endsWith(RFile.EXTENSION)) { + if (path.endsWith(RFILE_SUFFIX)) { if (pathComponents.length < 3) { throw new IllegalArgumentException("Fewer components in file path than expected"); }