Index: src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java (revision 999511) +++ src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java (working copy) @@ -152,7 +152,7 @@ if (bytes == null || bytes.length <= 0) return; HRegionInfo hri = Writables.getHRegionInfo(bytes); if (!hris.containsKey(hri)) { - LOG.info("Fixup; missing daughter " + hri.getEncodedNameAsBytes()); + LOG.info("Fixup; missing daughter " + hri.getEncodedName()); MetaEditor.addDaughter(this.server.getCatalogTracker(), hri, null); this.services.getAssignmentManager().assign(hri); } Index: src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java (revision 999511) +++ src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java (working copy) @@ -100,9 +100,9 @@ if (serverInfo != null) addLocation(put, serverInfo); server.put(catalogRegionName, put); LOG.info("Added daughter " + regionInfo.getRegionNameAsString() + - " in region " + Bytes.toString(catalogRegionName) + " with " + - "server=" + serverInfo.getHostnamePort() + ", " + - "startcode=" + serverInfo.getStartCode()); + " in region " + Bytes.toString(catalogRegionName) + + (serverInfo == null? + ", serverInfo=null": ", serverInfo=" + serverInfo.getServerName())); } /**