diff --git a/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java b/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java
index dd5b04a..9fbc8ee 100644
--- a/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java
+++ b/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java
@@ -538,7 +538,7 @@ public class SplitLogManager extends ZooKeeperListener {
try {
getDataSetWatchSuccess(path, null, Integer.MIN_VALUE);
} catch (DeserializationException e1) {
- LOG.debug("failed to re-resubmit task " + path + " because of deserialization issue");
+ LOG.debug("Failed to re-resubmit task " + path + " because of deserialization issue", e1);
task.heartbeatNoDetails(EnvironmentEdgeManager.currentTimeMillis());
return false;
}
diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java b/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
index 50d97a9..4320cfe 100644
--- a/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
+++ b/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
@@ -1715,7 +1715,7 @@ public class HLog implements Syncable {
* Construct the HLog directory name
*
* @param serverName Server name formatted as described in {@link ServerName}
- * @return the relative HLog directory name, e.g. .logs/1.example.org,6030,12345
+ * @return the relative HLog directory name, e.g. .logs/1.example.org,60030,12345
* if serverName passed is 1.example.org,60030,12345
*/
public static String getHLogDirectoryName(final String serverName) {
diff --git a/src/main/java/org/apache/hadoop/hbase/util/Bytes.java b/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
index e904770..6d852ea 100644
--- a/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
+++ b/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
@@ -343,8 +343,10 @@ public class Bytes {
*/
public static String toStringBinary(final byte [] b, int off, int len) {
StringBuilder result = new StringBuilder();
+ // Just in case we are passed a 'len' that is > buffer length...
+ int length = Math.min(len - off, b.length - off);
try {
- String first = new String(b, off, len, "ISO-8859-1");
+ String first = new String(b, off, length, "ISO-8859-1");
for (int i = 0; i < first.length() ; ++i ) {
int ch = first.charAt(i) & 0xFF;
if ( (ch >= '0' && ch <= '9')