Updated Branches: refs/heads/1.4.5-SNAPSHOT b1a330c32 -> a7aeb881c
ACCUMULO-1633 applying Ted Yu's patch Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a7aeb881 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a7aeb881 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a7aeb881 Branch: refs/heads/1.4.5-SNAPSHOT Commit: a7aeb881cb08cf7b6da20ad1903308c9e9c09ef7 Parents: b1a330c Author: Eric Newton <e...@apache.org> Authored: Tue Sep 3 08:33:33 2013 -0400 Committer: Eric Newton <e...@apache.org> Committed: Tue Sep 3 08:33:33 2013 -0400 ---------------------------------------------------------------------- .../apache/accumulo/core/client/impl/TabletServerBatchWriter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/a7aeb881/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java ---------------------------------------------------------------------- diff --git a/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java b/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java index 0022e99..e18f3f9 100644 --- a/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java +++ b/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java @@ -195,7 +195,7 @@ public class TabletServerBatchWriter { checkForFailures(); - while ((totalMemUsed >= maxMem || flushing) && !somethingFailed) { + while ((totalMemUsed > maxMem || flushing) && !somethingFailed) { waitRTE(); }
