Repository: accumulo Updated Branches: refs/heads/master f8cdf1936 -> 47a1a72a7
ACCUMULO-2324 synchronize on plain old Object, and not a String Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/39613b4b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/39613b4b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/39613b4b Branch: refs/heads/master Commit: 39613b4b9191ddba241726c8efe6e6d51dea53f4 Parents: f6c268e Author: Eric Newton <eric.new...@gmail.com> Authored: Wed Feb 19 13:52:09 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Wed Feb 19 13:52:09 2014 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/39613b4b/server/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java b/server/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java index b842e09..c5a9528 100644 --- a/server/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java +++ b/server/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java @@ -219,7 +219,7 @@ public class DistributedWorkQueue { public void waitUntilDone(Set<String> workIDs) throws KeeperException, InterruptedException { - final String condVar = "cond"; + final Object condVar = new Object(); Watcher watcher = new Watcher() { @Override