From 8fd9db6d6c7a3b702e752b7c4aa18f48215c0852 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Tue, 17 Sep 2013 02:13:58 +0000 Subject: [PATCH] HBASE-9554 TestOfflineMetaRebuildOverlap#testMetaRebuildOverlapFail fails due to NPE git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1523870 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/hadoop/hbase/master/AssignmentManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b594cba6526..2b72fd3cbff 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 @@ -2298,7 +2298,7 @@ public class AssignmentManager extends ZooKeeperListener { // Region is not in transition. // We can unassign it only if it's not SPLIT/MERGED. state = regionStates.getRegionState(encodedName); - if (state.isMerged() || state.isSplit()) { + if (state != null && (state.isMerged() || state.isSplit())) { LOG.info("Attempting to unassign " + state + ", ignored"); return; }