From 8c3697b0d8a5f9f5f2403bdf975f765a88da93d2 Mon Sep 17 00:00:00 2001
From: Jimmy Xiang <jxiang@cloudera.com>
Date: Mon, 6 Oct 2014 17:23:13 -0700
Subject: [PATCH] HBASE-12184 ServerShutdownHandler throws NPE

---
 .../hadoop/hbase/master/handler/ServerShutdownHandler.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
index e85ca209945..1691c9df9da 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
@@ -188,7 +188,7 @@ public class ServerShutdownHandler extends EventHandler {
             mfs.prepareLogReplay(serverName, hris);
           } else {
             LOG.info("Splitting logs for " + serverName +
-              " before assignment; region count=" + hris.size());
+              " before assignment; region count=" + (hris == null ? 0 : hris.size()));
             this.services.getMasterFileSystem().splitLog(serverName);
           }
           am.getRegionStates().logSplit(serverName);