Repository: hbase Updated Branches: refs/heads/master e47bfb907 -> 2c22e2003
HBASE-15848 Fix possible null point dereference in RSGroupBasedLoadBalancer#getMisplacedRegions (Stephen Yuan Jiang) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2c22e200 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2c22e200 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2c22e200 Branch: refs/heads/master Commit: 2c22e2003cfbccc053f072201ad27079fed5b03b Parents: e47bfb9 Author: Stephen Yuan Jiang <syuanjiang...@gmail.com> Authored: Tue May 17 14:06:57 2016 -0700 Committer: Stephen Yuan Jiang <syuanjiang...@gmail.com> Committed: Tue May 17 14:06:57 2016 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/2c22e200/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java ---------------------------------------------------------------------- diff --git a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java index c4b4bf3..14bc442 100644 --- a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java +++ b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java @@ -325,7 +325,7 @@ public class RSGroupBasedLoadBalancer implements RSGroupableBalancer, LoadBalanc " on server: " + assignedServer + " found in group: " + RSGroupInfoManager.getRSGroupOfServer(assignedServer.getHostPort()) + - " outside of group: " + info.getName()); + " outside of group: " + (info == null ? "UNKNOWN" : info.getName())); misplacedRegions.add(region); } } @@ -346,7 +346,7 @@ public class RSGroupBasedLoadBalancer implements RSGroupableBalancer, LoadBalanc try { info = RSGroupInfoManager.getRSGroup( RSGroupInfoManager.getRSGroupOfTable(region.getTable())); - }catch(IOException exp){ + } catch (IOException exp) { LOG.debug("Group information null for region of table " + region.getTable(), exp); }