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/5a12a16b Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5a12a16b Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5a12a16b Branch: refs/heads/HBASE-15631-branch-1 Commit: 5a12a16b6e2fe8ef5e08af3b8a18f8eacc639d0e Parents: cd84de6 Author: Andrew Purtell <apurt...@apache.org> Authored: Wed Jul 5 15:37:10 2017 -0700 Committer: Andrew Purtell <apurt...@apache.org> Committed: Wed Jul 19 15:32:37 2017 -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/5a12a16b/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 fea1275..f69f093 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 @@ -331,7 +331,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); } } @@ -352,7 +352,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); }
