Index: hbase-server/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java (revision 1434099) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java (working copy) @@ -69,8 +69,8 @@ /** * Create a new ClientScanner for the specified table. An HConnection will be * retrieved using the passed Configuration. - * Note that the passed {@link Scan}'s start row maybe changed changed. - * + * Note that the passed {@link Scan}'s start row maybe changed changed. + * * @param conf The {@link Configuration} to use. * @param scan {@link Scan} to use in this scanner * @param tableName The table that we wish to scan @@ -80,11 +80,11 @@ final byte[] tableName) throws IOException { this(conf, scan, tableName, HConnectionManager.getConnection(conf)); } - + /** * Create a new ClientScanner for the specified table - * Note that the passed {@link Scan}'s start row maybe changed changed. - * + * Note that the passed {@link Scan}'s start row maybe changed changed. + * * @param conf The {@link Configuration} to use. * @param scan {@link Scan} to use in this scanner * @param tableName The table that we wish to scan @@ -250,7 +250,6 @@ if (this.scanMetrics == null) { return; } - final DataOutputBuffer d = new DataOutputBuffer(); MapReduceProtos.ScanMetrics pScanMetrics = ProtobufUtil.toScanMetrics(scanMetrics); scan.setAttribute(Scan.SCAN_ATTRIBUTES_METRICS_DATA, pScanMetrics.toByteArray()); } Index: hbase-server/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyOnlyFilter.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyOnlyFilter.java (revision 1434111) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyOnlyFilter.java (working copy) @@ -90,13 +90,13 @@ */ public static FirstKeyOnlyFilter parseFrom(final byte [] pbBytes) throws DeserializationException { - FilterProtos.FirstKeyOnlyFilter proto; + // There is nothing to deserialize. Why do this at all? try { - proto = FilterProtos.FirstKeyOnlyFilter.parseFrom(pbBytes); + FilterProtos.FirstKeyOnlyFilter.parseFrom(pbBytes); } catch (InvalidProtocolBufferException e) { throw new DeserializationException(e); } - + // Just return a new instance. return new FirstKeyOnlyFilter(); }