Repository: cloudstack Updated Branches: refs/heads/4.4-forward d55bf1efa -> 1b74f3f3c
disable XS event Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1b74f3f3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1b74f3f3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1b74f3f3 Branch: refs/heads/4.4-forward Commit: 1b74f3f3c864db55e3cd8e1f704c35b81d97ffbf Parents: d55bf1e Author: Anthony Xu <[email protected]> Authored: Tue Apr 29 11:48:12 2014 -0700 Committer: Anthony Xu <[email protected]> Committed: Tue Apr 29 11:48:12 2014 -0700 ---------------------------------------------------------------------- .../cloudstack/hypervisor/xenserver/XenServerResourceNewBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1b74f3f3/plugins/hypervisors/xen/src/org/apache/cloudstack/hypervisor/xenserver/XenServerResourceNewBase.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xen/src/org/apache/cloudstack/hypervisor/xenserver/XenServerResourceNewBase.java b/plugins/hypervisors/xen/src/org/apache/cloudstack/hypervisor/xenserver/XenServerResourceNewBase.java index d11db0d..a60fca0 100644 --- a/plugins/hypervisors/xen/src/org/apache/cloudstack/hypervisor/xenserver/XenServerResourceNewBase.java +++ b/plugins/hypervisors/xen/src/org/apache/cloudstack/hypervisor/xenserver/XenServerResourceNewBase.java @@ -102,7 +102,7 @@ public class XenServerResourceNewBase extends XenServer620SP1Resource { } - protected void waitForTask(Connection c, Task task, long pollInterval, long timeout) throws XenAPIException, XmlRpcException, TimeoutException { + protected void waitForTask2(Connection c, Task task, long pollInterval, long timeout) throws XenAPIException, XmlRpcException, TimeoutException { long beginTime = System.currentTimeMillis(); if (s_logger.isTraceEnabled()) { s_logger.trace("Task " + task.getNameLabel(c) + " (" + task.getType(c) + ") sent to " + c.getSessionReference() + " is pending completion with a " + timeout +
