Index: src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMemcache.java =================================================================== --- src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMemcache.java (revision 575373) +++ src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMemcache.java (working copy) @@ -286,8 +286,8 @@ List results = getKeys(this.memcache, origin, versions); for (int i = history.size() - 1; i >= 0; i--) { results.addAll(results.size(), getKeys(history.elementAt(i), origin, - versions == HConstants.ALL_VERSIONS? versions: - (results != null? versions - results.size(): versions))); + versions == HConstants.ALL_VERSIONS ? versions : + (versions - results.size()))); } return results; } finally { @@ -382,9 +382,10 @@ // Generate list of iterators HStoreKey firstKey = new HStoreKey(firstRow); for(int i = 0; i < backingMaps.length; i++) { - keyIterators[i] = (/*firstRow != null &&*/ firstRow.getLength() != 0)? - backingMaps[i].tailMap(firstKey).keySet().iterator(): - backingMaps[i].keySet().iterator(); + keyIterators[i] = (firstRow != null && firstRow.getLength() != 0) ? + backingMaps[i].tailMap(firstKey).keySet().iterator() : + backingMaps[i].keySet().iterator(); + while(getNext(i)) { if(! findFirstRow(i, firstRow)) { continue;