From 894ce84b8330f9e3b1ca5b04e591c7a77cd2ce13 Mon Sep 17 00:00:00 2001
From: ramkrishna <ramkrishna.s.vasudevan@gmail.com>
Date: Mon, 11 Jan 2016 16:50:59 +0530
Subject: [PATCH] HBASE-15027 - Findbug fix (addendum)

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

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 c4974cf9237..18cf35d09d6 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) {