ACCUMULO-2582 Used the wrong variable in the conditional
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/80a1688d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/80a1688d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/80a1688d Branch: refs/heads/master Commit: 80a1688d75cb1a060b849132371ab8fa605e9243 Parents: cd78169 Author: Josh Elser <[email protected]> Authored: Tue May 27 16:57:43 2014 -0400 Committer: Josh Elser <[email protected]> Committed: Tue May 27 16:57:43 2014 -0400 ---------------------------------------------------------------------- .../apache/accumulo/monitor/servlets/ReplicationServlet.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/80a1688d/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java ---------------------------------------------------------------------- diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java index 6fc8eed..9c6a1ea 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java @@ -209,9 +209,9 @@ public class ReplicationServlet extends BasicServlet { DistributedWorkQueue workQueue = new DistributedWorkQueue(workQueuePath, ServerConfiguration.getSystemConfiguration(inst)); for (String queueKey : workQueue.getWorkQueued()) { - Entry<String,ReplicationTarget> entry = AbstractWorkAssigner.fromQueueKey(queueKey); - String filename = entry.getKey(); - ReplicationTarget target = entry.getValue(); + Entry<String,ReplicationTarget> queueKeyPair = AbstractWorkAssigner.fromQueueKey(queueKey); + String filename = queueKeyPair.getKey(); + ReplicationTarget target = queueKeyPair.getValue(); byte[] data = zooCache.get(workQueuePath + "/" + queueKey); @@ -233,7 +233,7 @@ public class ReplicationServlet extends BasicServlet { } // If we found the work entry for it, try to compute some progress - if (null != entry) { + if (null != kv) { try { Status stat = Status.parseFrom(kv.getValue().get()); if (stat.getInfiniteEnd()) {
