Repository: hbase Updated Branches: refs/heads/0.98 e5ecfb944 -> d5dfec42b
HBASE-12184 ServerShutdownHandler throws NPE Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d5dfec42 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d5dfec42 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d5dfec42 Branch: refs/heads/0.98 Commit: d5dfec42b45fee4f3c3417ac4febef1c7b22f1e7 Parents: e5ecfb9 Author: Jimmy Xiang <[email protected]> Authored: Mon Oct 6 17:23:13 2014 -0700 Committer: Jimmy Xiang <[email protected]> Committed: Mon Oct 6 19:26:07 2014 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hbase/master/handler/ServerShutdownHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/d5dfec42/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java ---------------------------------------------------------------------- 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 903fd29..5df221c 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 @@ -198,7 +198,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);
