From ea3c445e2d73b2abcfb29f0e09c379551f86ee8f Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Tue, 7 Dec 2010 01:18:00 +0000 Subject: [PATCH] Fix possible NPE in assign git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1042885 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/hadoop/hbase/master/AssignmentManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java b/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java index 56e69073c89..c3fd667a141 100644 --- a/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java +++ b/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java @@ -956,7 +956,7 @@ public class AssignmentManager extends ZooKeeperListener { 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); }