Repository: hbase
Updated Branches:
  refs/heads/branch-1.1 d2842f076 -> ef6777d68


HBASE-13663 HMaster fails to restart 'HMaster: Failed to become active master'


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

Branch: refs/heads/branch-1.1
Commit: ef6777d6871008c914047635b8c6d733c433e865
Parents: d2842f0
Author: tedyu <[email protected]>
Authored: Tue May 12 09:03:51 2015 -0700
Committer: tedyu <[email protected]>
Committed: Tue May 12 09:03:51 2015 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/hbase/master/AssignmentManager.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/ef6777d6/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
----------------------------------------------------------------------
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
index 34c4963..cd0e9d7 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
@@ -2949,6 +2949,7 @@ public class AssignmentManager extends ZooKeeperListener {
       HRegionLocation[] locations = rl.getRegionLocations();
       if (locations == null) continue;
       for (HRegionLocation hrl : locations) {
+        if (hrl == null) continue;
         HRegionInfo regionInfo = hrl.getRegionInfo();
         if (regionInfo == null) continue;
         int replicaId = regionInfo.getReplicaId();

Reply via email to