Return-Path: 
 <commits-return-25795-apmail-hbase-commits-archive=hbase.apache.org@hbase.apache.org>
X-Original-To: apmail-hbase-commits-archive@www.apache.org
Delivered-To: apmail-hbase-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id E33B318F81
	for <apmail-hbase-commits-archive@www.apache.org>;
 Wed,  1 Jul 2015 22:01:59 +0000 (UTC)
Received: (qmail 24578 invoked by uid 500); 1 Jul 2015 22:01:59 -0000
Delivered-To: apmail-hbase-commits-archive@hbase.apache.org
Received: (qmail 24408 invoked by uid 500); 1 Jul 2015 22:01:59 -0000
Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hbase.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hbase.apache.org>
List-Post: <mailto:commits@hbase.apache.org>
List-Id: <commits.hbase.apache.org>
Reply-To: dev@hbase.apache.org
Delivered-To: mailing list commits@hbase.apache.org
Received: (qmail 24331 invoked by uid 99); 1 Jul 2015 22:01:59 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jul 2015 22:01:59 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 51CCAE04D8; Wed,  1 Jul 2015 22:01:59 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: apurtell@apache.org
To: commits@hbase.apache.org
Date: Wed, 01 Jul 2015 22:02:00 -0000
Message-Id: <12fdbde9307849d6abcec97136e37a59@git.apache.org>
In-Reply-To: <f40abc57250f456ea194674158a13cc7@git.apache.org>
References: <f40abc57250f456ea194674158a13cc7@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/5] hbase git commit: HBASE-13923 Addendum fixes NPE in
 HRegionServer#buildServerLoad()

HBASE-13923 Addendum fixes NPE in HRegionServer#buildServerLoad()

Conflicts:
	hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c34db5e8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c34db5e8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c34db5e8

Branch: refs/heads/0.98
Commit: c34db5e837454438e80fdcc4c56ff45e44197906
Parents: 5f8219f
Author: tedyu <yuzhihong@gmail.com>
Authored: Thu Jun 25 16:30:52 2015 -0700
Committer: Andrew Purtell <apurtell@apache.org>
Committed: Wed Jul 1 12:22:22 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/c34db5e8/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 5a14f40..2b7bdf8 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
@@ -1165,10 +1165,12 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa
     RegionLoad.Builder regionLoadBldr = RegionLoad.newBuilder();
     RegionSpecifier.Builder regionSpecifier = RegionSpecifier.newBuilder();
     for (HRegion 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()