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 E3AAF11ED2 for ; Tue, 5 Aug 2014 17:52:57 +0000 (UTC) Received: (qmail 65397 invoked by uid 500); 5 Aug 2014 17:52:57 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 65358 invoked by uid 500); 5 Aug 2014 17:52:57 -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 65345 invoked by uid 99); 5 Aug 2014 17:52:57 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Aug 2014 17:52:57 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8A39E9C00C7; Tue, 5 Aug 2014 17:52:57 +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: Tue, 05 Aug 2014 17:52:57 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: ACCUMULO-3024 really delete the directory and any gunk under it Repository: accumulo Updated Branches: refs/heads/master c3d219560 -> 962eb982e ACCUMULO-3024 really delete the directory and any gunk under it Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/67c17575 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/67c17575 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/67c17575 Branch: refs/heads/master Commit: 67c17575d8b853cbb98f5f65ef1304dce7da320e Parents: 5a90ed7 Author: Eric C. Newton Authored: Tue Aug 5 13:51:41 2014 -0400 Committer: Eric C. Newton Committed: Tue Aug 5 13:51:41 2014 -0400 ---------------------------------------------------------------------- .../start/classloader/vfs/AccumuloVFSClassLoader.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/67c17575/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java ---------------------------------------------------------------------- diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java index 49c5b99..b08bd7e 100644 --- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java +++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java @@ -30,6 +30,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.accumulo.start.classloader.AccumuloClassLoader; import org.apache.accumulo.start.classloader.vfs.providers.HdfsFileObject; import org.apache.accumulo.start.classloader.vfs.providers.HdfsFileProvider; +import org.apache.commons.io.FileUtils; import org.apache.commons.vfs2.CacheStrategy; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemException; @@ -406,6 +407,10 @@ public class AccumuloVFSClassLoader { ref.close(); } } - computeTopCacheDir().delete(); + try { + FileUtils.deleteDirectory(computeTopCacheDir()); + } catch (IOException e) { + log.error(e, e); + } } }