svn commit: r1042885 - /hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java

[stack]

Author: stack
Date: Tue Dec  7 01:18:00 2010
New Revision: 1042885

URL: http://svn.apache.org/viewvc?rev=1042885&view=rev
Log:
Fix possible NPE in assign

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

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=1042885&r1=1042884&r2=1042885&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 
Tue Dec  7 01:18:00 2010
@@ -956,7 +956,7 @@ public class AssignmentManager extends Z
     synchronized (this.regionPlans) {
       existingPlan = this.regionPlans.get(encodedName);
       if (existingPlan == null || forceNewPlan ||
-          existingPlan.getDestination().equals(serverToExclude)) {
+          (existingPlan != null && 
existingPlan.getDestination().equals(serverToExclude))) {
         newPlan = true;
         this.regionPlans.put(encodedName, randomPlan);
       }