Index: hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java (revision 1453107) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java (working copy) @@ -550,8 +550,15 @@ } private boolean isValidMetaTableRow(byte[] metaRow) { - return (com.google.common.primitives.Bytes - .indexOf(metaRow, HConstants.META_ROW_DELIMITER_BYTES) != -1); + if (metaRow == null) return false; + boolean commaSeen = false; + for (int i = 0; i < metaRow.length; i++) { + if (metaRow[i] == 44) { // look for comma + if (commaSeen) return true; // second comma means it is valid Meta table row + commaSeen = true; + } + } + return commaSeen; } /**