hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1523870 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Date Tue, 17 Sep 2013 02:13:59 GMT
Author: stack
Date: Tue Sep 17 02:13:58 2013
New Revision: 1523870

URL: http://svn.apache.org/r1523870
Log:
HBASE-9554 TestOfflineMetaRebuildOverlap#testMetaRebuildOverlapFail fails due to NPE

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1523870&r1=1523869&r2=1523870&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
(original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Tue Sep 17 02:13:58 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;
         }



Mime
View raw message