svn commit: r1213236 - /incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java

[ecn]

Author: ecn
Date: Mon Dec 12 13:32:58 2011
New Revision: 1213236

URL: http://svn.apache.org/viewvc?rev=1213236&view=rev
Log:
ACCUMULO-202: merge to trunk

Modified:
    
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java

Modified: 
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
URL: 
http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java?rev=1213236&r1=1213235&r2=1213236&view=diff
==============================================================================
--- 
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
 (original)
+++ 
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
 Mon Dec 12 13:32:58 2011
@@ -253,7 +253,7 @@ public class LiveTServerSet implements W
         }
       }
       // log.debug("Current: " + current.keySet());
-      if (!doomed.isEmpty() && !updates.isEmpty())
+      if (!doomed.isEmpty() || !updates.isEmpty())
         this.cback.update(this, doomed, updates);
     } catch (Exception ex) {
       log.error(ex, ex);