hadoop git commit: HDFS-8548. Minicluster throws NPE on shutdown. Contributed by surendra singh lilhore.

2016-06-03 Thread xyao 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 fe08ba439 -> 97e79662b


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/97e79662
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/97e79662
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/97e79662

Branch: refs/heads/branch-2.7
Commit: 97e79662b6aea1f5ae952058736c5254d0d7fa48
Parents: fe08ba4
Author: Xiaoyu Yao 
Authored: Tue Jun 16 13:52:50 2015 -0700
Committer: Xiaoyu Yao 
Committed: Fri Jun 3 12:55:31 2016 -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/97e79662/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 898777e..26bb1e5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -181,6 +181,9 @@ Release 2.7.3 - UNRELEASED
 HDFS-9476. TestDFSUpgradeFromImage#testUpgradeFromRel1BBWImage
 occasionally fail. (Masatake Iwasaki via aajisaka)
 
+HDFS-8548. Minicluster throws NPE on shutdown.
+(surendra singh lilhore via xyao)
+
 Release 2.7.2 - 2016-01-25
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/97e79662/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 806a4cb..9a45b8c 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
@@ -200,7 +200,11 @@ class BlocksMap {
   }
 
   int size() {
-return blocks.size();
+if (blocks != null) {
+  return blocks.size();
+} else {
+  return 0;
+}
   }
 
   Iterable getBlocks() {


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[12/50] [abbrv] hadoop git commit: HDFS-8548. Minicluster throws NPE on shutdown. Contributed by surendra singh lilhore.

2015-06-20 Thread arp 
HDFS-8548. Minicluster throws NPE on shutdown. Contributed by surendra singh 
lilhore.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6a76250b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6a76250b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6a76250b

Branch: refs/heads/HDFS-7240
Commit: 6a76250b39f33466bdc8dabab33070c90aa1a389
Parents: c74517c
Author: Xiaoyu Yao x...@apache.org
Authored: Tue Jun 16 13:52:50 2015 -0700
Committer: Xiaoyu Yao x...@apache.org
Committed: Tue Jun 16 13:57:02 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/6a76250b/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 b921f2c..c8c36e6 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -900,6 +900,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/6a76250b/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;
+}
   }
 
   IterableBlockInfo getBlocks() {

[28/50] [abbrv] hadoop git commit: HDFS-8548. Minicluster throws NPE on shutdown. Contributed by surendra singh lilhore.

2015-06-18 Thread zjshen 
HDFS-8548. Minicluster throws NPE on shutdown. Contributed by surendra singh 
lilhore.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/816ab879
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/816ab879
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/816ab879

Branch: refs/heads/YARN-2928
Commit: 816ab879661b6ed580b21f0b47771bec5115451f
Parents: b509768
Author: Xiaoyu Yao x...@apache.org
Authored: Tue Jun 16 13:52:50 2015 -0700
Committer: Zhijie Shen zjs...@apache.org
Committed: Thu Jun 18 11:18:58 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/816ab879/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 b921f2c..c8c36e6 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -900,6 +900,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/816ab879/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;
+}
   }
 
   IterableBlockInfo getBlocks() {

hadoop git commit: HDFS-8548. Minicluster throws NPE on shutdown. Contributed by surendra singh lilhore.

2015-06-16 Thread xyao 
Repository: hadoop
Updated Branches:
  refs/heads/trunk c74517c46 - 6a76250b3


HDFS-8548. Minicluster throws NPE on shutdown. Contributed by surendra singh 
lilhore.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6a76250b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6a76250b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6a76250b

Branch: refs/heads/trunk
Commit: 6a76250b39f33466bdc8dabab33070c90aa1a389
Parents: c74517c
Author: Xiaoyu Yao x...@apache.org
Authored: Tue Jun 16 13:52:50 2015 -0700
Committer: Xiaoyu Yao x...@apache.org
Committed: Tue Jun 16 13:57:02 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/6a76250b/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 b921f2c..c8c36e6 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -900,6 +900,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/6a76250b/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;
+}
   }
 
   IterableBlockInfo getBlocks() {

hadoop git commit: HDFS-8548. Minicluster throws NPE on shutdown. Contributed by surendra singh lilhore.

2015-06-16 Thread xyao 
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 x...@apache.org
Authored: Tue Jun 16 13:52:50 2015 -0700
Committer: Xiaoyu Yao x...@apache.org
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;
+}
   }
 
   IterableBlockInfo getBlocks() {