Return-Path: 
 <commits-return-30958-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 B89A718594
	for <apmail-hbase-commits-archive@www.apache.org>;
 Thu, 14 Jan 2016 17:08:23 +0000 (UTC)
Received: (qmail 48032 invoked by uid 500); 14 Jan 2016 17:08:18 -0000
Delivered-To: apmail-hbase-commits-archive@hbase.apache.org
Received: (qmail 47784 invoked by uid 500); 14 Jan 2016 17:08:18 -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 45641 invoked by uid 99); 14 Jan 2016 17:08:16 -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; Thu, 14 Jan 2016 17:08:16 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id A4FB3E3884; Thu, 14 Jan 2016 17:08:16 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: jmhsieh@apache.org
To: commits@hbase.apache.org
Date: Thu, 14 Jan 2016 17:08:56 -0000
Message-Id: <fca8b57d5d794e0cb4b20ab354147279@git.apache.org>
In-Reply-To: <905a3c78f4ba4d328e999299653daa05@git.apache.org>
References: <905a3c78f4ba4d328e999299653daa05@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [42/50] [abbrv] hbase git commit: HBASE-15027 - Findbug fix
 (addendum)

HBASE-15027 - Findbug fix (addendum)


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

Branch: refs/heads/trunk
Commit: 894ce84b8330f9e3b1ca5b04e591c7a77cd2ce13
Parents: c2f67a0
Author: ramkrishna <ramkrishna.s.vasudevan@gmail.com>
Authored: Mon Jan 11 16:50:59 2016 +0530
Committer: ramkrishna <ramkrishna.s.vasudevan@gmail.com>
Committed: Mon Jan 11 16:50:59 2016 +0530

----------------------------------------------------------------------
 .../hadoop/hbase/regionserver/CompactedHFilesDischarger.java      | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/894ce84b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactedHFilesDischarger.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactedHFilesDischarger.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactedHFilesDischarger.java
index c4974cf..18cf35d 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactedHFilesDischarger.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactedHFilesDischarger.java
@@ -73,6 +73,9 @@ public class CompactedHFilesDischarger extends ScheduledChore {
 
   @Override
   public void chore() {
+    // Noop if rss is null. This will never happen in a normal condition except for cases
+    // when the test case is not spinning up a cluster
+    if (regionServerServices == null) return;
     List<Region> onlineRegions = regionServerServices.getOnlineRegions();
     if (onlineRegions != null) {
       for (Region region : onlineRegions) {