hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jxi...@apache.org
Subject git commit: HBASE-12184 ServerShutdownHandler throws NPE
Date Tue, 07 Oct 2014 02:25:28 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 ed17aacbb -> 61528378e


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/61528378
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/61528378
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/61528378

Branch: refs/heads/branch-1
Commit: 61528378e2998a491ebb881bde368de646a4123a
Parents: ed17aac
Author: Jimmy Xiang <jxiang@cloudera.com>
Authored: Mon Oct 6 17:23:13 2014 -0700
Committer: Jimmy Xiang <jxiang@cloudera.com>
Committed: Mon Oct 6 19:25: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/61528378/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 b7af437..1280064 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
@@ -208,7 +208,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);


Mime
View raw message