From b9ebc5ad16bec22eb6fe3c6203331fc27edbbf5c Mon Sep 17 00:00:00 2001 From: alena Date: Mon, 13 Jun 2011 22:43:34 -0700 Subject: [PATCH] Added findRequest() method to ClusteredAgentAttache - needed for cancelling requests in transfer queue --- .../cloud/agent/manager/ClusteredAgentAttache.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/server/src/com/cloud/agent/manager/ClusteredAgentAttache.java b/server/src/com/cloud/agent/manager/ClusteredAgentAttache.java index 0374e3969e8..850a7435f4c 100644 --- a/server/src/com/cloud/agent/manager/ClusteredAgentAttache.java +++ b/server/src/com/cloud/agent/manager/ClusteredAgentAttache.java @@ -222,6 +222,18 @@ public class ClusteredAgentAttache extends ConnectedAgentAttache implements Rout assert (index < 0) : "How can we get index again? " + index + ":" + req.toString(); _transferRequests.add(-index - 1, req); } + + + @Override + //need separate method in order to cancel transfer requests + protected synchronized int findRequest(long seq) { + int result = Collections.binarySearch(_transferRequests, seq, s_seqComparator); + if (result < 0) { + return Collections.binarySearch(_requests, seq, s_seqComparator); + } + + return result; + } protected synchronized int findTransferRequest(Request req) { return Collections.binarySearch(_transferRequests, req, s_reqComparator);