### Eclipse Workspace Patch 1.0 #P hbase-0.90.0RC2 Index: src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (revision 1054690) +++ src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (working copy) @@ -21,8 +21,8 @@ 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 @@ 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); }