Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4755F200BBF for ; Mon, 14 Nov 2016 16:13:51 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 45F9C160B05; Mon, 14 Nov 2016 15:13:51 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8E45D160B0D for ; Mon, 14 Nov 2016 16:13:50 +0100 (CET) Received: (qmail 50213 invoked by uid 500); 14 Nov 2016 15:13:49 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 50029 invoked by uid 99); 14 Nov 2016 15:13:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Nov 2016 15:13:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4BD50E01D9; Mon, 14 Nov 2016 15:13:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brahma@apache.org To: common-commits@hadoop.apache.org Date: Mon, 14 Nov 2016 15:13:50 -0000 Message-Id: <514ebfb5b09348d9a1e6a66308a4c8c7@git.apache.org> In-Reply-To: <96e21967f5e640f9a83a270f72907c01@git.apache.org> References: <96e21967f5e640f9a83a270f72907c01@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] hadoop git commit: HDFS-11135. The tests in TestBalancer run fails due to NPE. Contributed By Yiqun Lin archived-at: Mon, 14 Nov 2016 15:13:51 -0000 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 Authored: Mon Nov 14 20:39:39 2016 +0530 Committer: Brahma Reddy Battula 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 fileLen */ --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org