svn commit: r1196267 - /incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java

[vi...@apache.org]

Author: vines
Date: Tue Nov  1 20:49:41 2011
New Revision: 1196267

URL: http://svn.apache.org/viewvc?rev=1196267&view=rev
Log:
fixes accumulo-56

Modified:
    incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java?rev=1196267&r1=1196266&r2=1196267&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java Tue Nov  1 20:49:41 2011
@@ -2871,7 +2871,8 @@ public class Tablet {
       } else {
         Key first = pair.getFirst();
         Key last = pair.getSecond();
-        if (!this.extent.contains(first.getRow()) || !this.extent.contains(last.getRow())) {
+        // If first and last are null, it's an empty file. Add it to the compact set so it goes away.
+        if ( (first == null && last == null) || !this.extent.contains(first.getRow()) || !this.extent.contains(last.getRow())) {
           result.put(file, entry.getValue().getSize());
         }
       }