HDFS-11135. The tests in TestBalancer run fails due to NPE. Contributed By Yiqun Lin
(cherry picked from commit 6efb8c9c6018ec688eeba8c61c220009ec350a44) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/399abe7c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/399abe7c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/399abe7c Branch: refs/heads/branch-2 Commit: 399abe7c74b8752d942066fa71a1e126728d41c5 Parents: ea74c7b Author: Brahma Reddy Battula <bra...@apache.org> Authored: Mon Nov 14 20:39:39 2016 +0530 Committer: Brahma Reddy Battula <bra...@apache.org> Committed: Mon Nov 14 20:41:55 2016 +0530 ---------------------------------------------------------------------- .../org/apache/hadoop/hdfs/server/balancer/TestBalancer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/399abe7c/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java index d89a3ed..8e9bd7b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java @@ -252,9 +252,9 @@ public class TestBalancer { public static void destroy() throws Exception { if (kdc != null) { kdc.stop(); - } - FileUtil.fullyDelete(baseDir); + FileUtil.fullyDelete(baseDir); KeyStoreTestUtil.cleanupSSLConfig(keystoresDir, sslConfDir); + } } /* create a file with a length of <code>fileLen</code> */ --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
