You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2015/06/26 01:30:49 UTC
hbase git commit: HBASE-13923 Addendum fixes NPE in
HRegionServer#buildServerLoad()
Repository: hbase
Updated Branches:
refs/heads/branch-1 92b6622d9 -> f248f8639
HBASE-13923 Addendum fixes NPE in HRegionServer#buildServerLoad()
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f248f863
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f248f863
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f248f863
Branch: refs/heads/branch-1
Commit: f248f8639665d1f859c2e5cd1cc492d00e691ab4
Parents: 92b6622
Author: tedyu <yu...@gmail.com>
Authored: Thu Jun 25 16:30:52 2015 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Thu Jun 25 16:30:52 2015 -0700
----------------------------------------------------------------------
.../apache/hadoop/hbase/regionserver/HRegionServer.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/f248f863/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
index 38e62a7..ad1bacb 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
@@ -1177,10 +1177,12 @@ public class HRegionServer extends HasThread implements
RegionLoad.Builder regionLoadBldr = RegionLoad.newBuilder();
RegionSpecifier.Builder regionSpecifier = RegionSpecifier.newBuilder();
for (Region region : regions) {
- Set<String> regionCoprocessors = region.getCoprocessorHost().getCoprocessors();
- Iterator<String> iterator = regionCoprocessors.iterator();
- while (iterator.hasNext()) {
- serverLoad.addCoprocessors(coprocessorBuilder.setName(iterator.next()).build());
+ if (region.getCoprocessorHost() != null) {
+ Set<String> regionCoprocessors = region.getCoprocessorHost().getCoprocessors();
+ Iterator<String> iterator = regionCoprocessors.iterator();
+ while (iterator.hasNext()) {
+ serverLoad.addCoprocessors(coprocessorBuilder.setName(iterator.next()).build());
+ }
}
serverLoad.addRegionLoads(createRegionLoad(region, regionLoadBldr, regionSpecifier));
for (String coprocessor : getWAL(region.getRegionInfo()).getCoprocessorHost()