Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-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 83A8018A87 for ; Tue, 16 Jun 2015 21:03:49 +0000 (UTC) Received: (qmail 65348 invoked by uid 500); 16 Jun 2015 21:03:49 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 65278 invoked by uid 500); 16 Jun 2015 21:03:49 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 65269 invoked by uid 99); 16 Jun 2015 21:03: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; Tue, 16 Jun 2015 21:03:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E6070E4094; Tue, 16 Jun 2015 21:03:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: xyao@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-8548. Minicluster throws NPE on shutdown. Contributed by surendra singh lilhore. Date: Tue, 16 Jun 2015 21:03:48 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2 d2d038b0a -> 8ab23d9ec HDFS-8548. Minicluster throws NPE on shutdown. Contributed by surendra singh lilhore. (cherry picked from commit 6a76250b39f33466bdc8dabab33070c90aa1a389) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8ab23d9e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8ab23d9e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8ab23d9e Branch: refs/heads/branch-2 Commit: 8ab23d9ec102ae231987d6fd156e73c15eb8eb6f Parents: d2d038b Author: Xiaoyu Yao Authored: Tue Jun 16 13:52:50 2015 -0700 Committer: Xiaoyu Yao Committed: Tue Jun 16 14:00:33 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../apache/hadoop/hdfs/server/blockmanagement/BlocksMap.java | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/8ab23d9e/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index dd6aff7..23a202a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -560,6 +560,9 @@ Release 2.8.0 - UNRELEASED HDFS-8592. SafeModeException never get unwrapped. (wheat9) + HDFS-8548. Minicluster throws NPE on shutdown. + (surendra singh lilhore via xyao) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/8ab23d9e/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlocksMap.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlocksMap.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlocksMap.java index 9eb1059..0dbf485 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlocksMap.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlocksMap.java @@ -198,7 +198,11 @@ class BlocksMap { } int size() { - return blocks.size(); + if (blocks != null) { + return blocks.size(); + } else { + return 0; + } } Iterable getBlocks() {