Repository: incubator-blur Updated Branches: refs/heads/master fccde5298 -> 7a2dbd786
Fixing an issue with jdk 6. Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/8f402ed4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/8f402ed4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/8f402ed4 Branch: refs/heads/master Commit: 8f402ed4ce6d0689325e536f3ba7d9a92c6a2195 Parents: 9fc5afb Author: Aaron McCurry <[email protected]> Authored: Wed Nov 5 07:37:16 2014 -0500 Committer: Aaron McCurry <[email protected]> Committed: Wed Nov 5 07:37:16 2014 -0500 ---------------------------------------------------------------------- .../org/apache/blur/manager/writer/SharedMergeScheduler.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8f402ed4/blur-core/src/main/java/org/apache/blur/manager/writer/SharedMergeScheduler.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/manager/writer/SharedMergeScheduler.java b/blur-core/src/main/java/org/apache/blur/manager/writer/SharedMergeScheduler.java index 02728e8..34d602e 100644 --- a/blur-core/src/main/java/org/apache/blur/manager/writer/SharedMergeScheduler.java +++ b/blur-core/src/main/java/org/apache/blur/manager/writer/SharedMergeScheduler.java @@ -81,7 +81,10 @@ public class SharedMergeScheduler implements Closeable { @Override public int compareTo(MergeWork o) { - return Long.compare(_size, o._size); + if (_size == o._size) { + return 0; + } + return _size < o._size ? -1 : 1; } public void merge() throws IOException {
