hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1197814 - in /hbase/branches/0.92: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Date Fri, 04 Nov 2011 23:09:29 GMT
Author: stack
Date: Fri Nov  4 23:09:29 2011
New Revision: 1197814

URL: http://svn.apache.org/viewvc?rev=1197814&view=rev
Log:
HBASE-4725 NPE in AM#updateTimers

Modified:
    hbase/branches/0.92/CHANGES.txt
    hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java

Modified: hbase/branches/0.92/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1197814&r1=1197813&r2=1197814&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Fri Nov  4 23:09:29 2011
@@ -404,6 +404,7 @@ Release 0.92.0 - Unreleased
    HBASE-4716  Improve locking for single column family bulk load
    HBASE-2312  Possible data loss when RS goes into GC pause while rolling HLog (requires
HDFS 0.20.205.1+)
    HBASE-4553  The update of .tableinfo is not atomic; we remove then rename
+   HBASE-4725  NPE in AM#updateTimers
 
   TESTS
    HBASE-4492  TestRollingRestart fails intermittently

Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1197814&r1=1197813&r2=1197814&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
(original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Fri Nov  4 23:09:29 2011
@@ -1056,6 +1056,7 @@ public class AssignmentManager extends Z
       copy.putAll(this.regionPlans);
     }
     for (Map.Entry<String, RegionPlan> e: copy.entrySet()) {
+      if (e.getValue() == null || e.getValue().getDestination() == null) continue;
       if (!e.getValue().getDestination().equals(sn)) continue;
       RegionState rs = null;
       synchronized (this.regionsInTransition) {



Mime
View raw message