You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jx...@apache.org on 2014/10/07 04:00:41 UTC
git commit: HBASE-12184 ServerShutdownHandler throws NPE
Repository: hbase
Updated Branches:
refs/heads/master 062adcc18 -> 8c3697b0d
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/8c3697b0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8c3697b0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8c3697b0
Branch: refs/heads/master
Commit: 8c3697b0d8a5f9f5f2403bdf975f765a88da93d2
Parents: 062adcc
Author: Jimmy Xiang <jx...@cloudera.com>
Authored: Mon Oct 6 17:23:13 2014 -0700
Committer: Jimmy Xiang <jx...@cloudera.com>
Committed: Mon Oct 6 17:28:39 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/8c3697b0/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 e85ca20..1691c9d 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);