hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1055248 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Date Wed, 05 Jan 2011 00:01:56 GMT
Author: stack
Date: Wed Jan  5 00:01:56 2011
New Revision: 1055248

URL: http://svn.apache.org/viewvc?rev=1055248&view=rev
Log:
HBASE-3408 AssignmentManager NullPointerException

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

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1055248&r1=1055247&r2=1055248&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Wed Jan  5 00:01:56 2011
@@ -812,6 +812,7 @@ Release 0.90.0 - Unreleased
    HBASE-3383  [0.90RC1] bin/hbase script displays "no such file" warning on
                target/cached_classpath.txt
    HBASE-3344  Master aborts after RPC to server that was shutting down
+   HBASE-3408  AssignmentManager NullPointerException
 
 
   IMPROVEMENTS

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1055248&r1=1055247&r2=1055248&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java Wed Jan
 5 00:01:56 2011
@@ -21,8 +21,8 @@ package org.apache.hadoop.hbase.master;
 
 import java.io.DataInput;
 import java.io.DataOutput;
-import java.io.IOException;
 import java.io.EOFException;
+import java.io.IOException;
 import java.net.ConnectException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -1005,8 +1005,9 @@ public class AssignmentManager extends Z
     RegionPlan existingPlan = null;
     synchronized (this.regionPlans) {
       existingPlan = this.regionPlans.get(encodedName);
-      if (existingPlan == null || forceNewPlan ||
-          (existingPlan != null && existingPlan.getDestination().equals(serverToExclude)))
{
+      if (forceNewPlan || existingPlan == null 
+              || existingPlan.getDestination() == null 
+              || existingPlan.getDestination().equals(serverToExclude)) {
         newPlan = true;
         this.regionPlans.put(encodedName, randomPlan);
       }



Mime
View raw message