commit 06ab8216295ea25403534cf9c3b3e1db5683cb77
author adamtracymartin <atmartin@yahoo.com> Wed Apr 12 21:36:19 2017 -0700
committer Sijie Guo <sijie@apache.org> Wed Apr 12 21:36:19 2017 -0700
tree 83add17e2e41071c5396826860bcbe329d7a960f
parent 2adb499f21de3600f4b30bda8c1b8fdf26f45162

DL-173: changed FileUtils.deleteDirectory to FileUtils.forceDeleteOnExit so d…

I am doing a new pull request because I deleted the branch in the remote.
Actions done to fix the conflict.
1. git checkout DL-173
2. git checkout master distributedlog-protocol/src/main/thrift/service.thrift
3. git fetch
4. git add *
5. git commit with message

The actual fix for this branch is changing FileUtils.deleteDirectory to FileUtils.forceDeleteOnExit.

Author: adamtracymartin <atmartin@yahoo.com>

Reviewers: Jia Zhai <zhaijia03@gmail.com>, Sijie Guo <sijie@apache.org>, Leigh Stewart <lstewart@apache.org>

Closes #116 from adamtracymartin/DL-173

distributedlog-core/src/main/java/org/apache/distributedlog/LocalDLMEmulator.java

diff --git a/distributedlog-core/src/main/java/org/apache/distributedlog/LocalDLMEmulator.java b/distributedlog-core/src/main/java/org/apache/distributedlog/LocalDLMEmulator.java
index 5623525..f2c510d 100644
--- a/distributedlog-core/src/main/java/org/apache/distributedlog/LocalDLMEmulator.java
+++ b/distributedlog-core/src/main/java/org/apache/distributedlog/LocalDLMEmulator.java
@@ -168,7 +168,7 @@
             bkStartupThread.join();
         }
         for (File dir : tmpDirs) {
-            FileUtils.deleteDirectory(dir);
+            FileUtils.forceDeleteOnExit(dir);
         }
     }
 
@@ -344,7 +344,7 @@
                 public void run() {
                     try {
                         localDlm.teardown();
-                        FileUtils.deleteDirectory(zkDir);
+                        FileUtils.forceDeleteOnExit(zkDir);
                         System.out.println("ByeBye!");
                     } catch (Exception e) {
                         // do nothing

distributedlog-core/src/test/java/org/apache/distributedlog/TestDistributedLogBase.java

diff --git a/distributedlog-core/src/test/java/org/apache/distributedlog/TestDistributedLogBase.java b/distributedlog-core/src/test/java/org/apache/distributedlog/TestDistributedLogBase.java
index 2769175..a766d3e 100644
--- a/distributedlog-core/src/test/java/org/apache/distributedlog/TestDistributedLogBase.java
+++ b/distributedlog-core/src/test/java/org/apache/distributedlog/TestDistributedLogBase.java
@@ -115,7 +115,7 @@
         bkutil.teardown();
         zks.stop();
         for (File dir : tmpDirs) {
-            FileUtils.deleteDirectory(dir);
+            FileUtils.forceDeleteOnExit(dir);
         }
     }
 

distributedlog-core/src/test/java/org/apache/distributedlog/ZooKeeperClusterTestCase.java

diff --git a/distributedlog-core/src/test/java/org/apache/distributedlog/ZooKeeperClusterTestCase.java b/distributedlog-core/src/test/java/org/apache/distributedlog/ZooKeeperClusterTestCase.java
index 3eeb870..2b6204d 100644
--- a/distributedlog-core/src/test/java/org/apache/distributedlog/ZooKeeperClusterTestCase.java
+++ b/distributedlog-core/src/test/java/org/apache/distributedlog/ZooKeeperClusterTestCase.java
@@ -47,7 +47,7 @@
     public static void shutdownZooKeeper() throws Exception {
         zks.stop();
         if (null != zkDir) {
-            FileUtils.deleteDirectory(zkDir);
+            FileUtils.forceDeleteOnExit(zkDir);
         }
     }
 }

distributedlog-service/src/main/java/org/apache/distributedlog/service/DistributedLogCluster.java

diff --git a/distributedlog-service/src/main/java/org/apache/distributedlog/service/DistributedLogCluster.java b/distributedlog-service/src/main/java/org/apache/distributedlog/service/DistributedLogCluster.java
index aadd71e..9cc085d 100644
--- a/distributedlog-service/src/main/java/org/apache/distributedlog/service/DistributedLogCluster.java
+++ b/distributedlog-service/src/main/java/org/apache/distributedlog/service/DistributedLogCluster.java
@@ -333,7 +333,7 @@
             this.zks.stop();
         }
         for (File dir : tmpDirs) {
-            FileUtils.deleteDirectory(dir);
+            FileUtils.forceDeleteOnExit(dir);
         }
     }