You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2013/09/17 04:13:28 UTC
svn commit: r1523869 -
/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Author: stack
Date: Tue Sep 17 02:13:28 2013
New Revision: 1523869
URL: http://svn.apache.org/r1523869
Log:
HBASE-9554 TestOfflineMetaRebuildOverlap#testMetaRebuildOverlapFail fails due to NPE
Modified:
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1523869&r1=1523868&r2=1523869&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java Tue Sep 17 02:13:28 2013
@@ -2298,7 +2298,7 @@ public class AssignmentManager extends Z
// 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;
}