Repository: cloudstack Updated Branches: refs/heads/master 56a44151a -> 282c9da68
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/282c9da6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/282c9da6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/282c9da6 Branch: refs/heads/master Commit: 282c9da68ed30a70736777c858b99469ae04601c Parents: 56a4415 Author: Anthony Xu <[email protected]> Authored: Tue Apr 29 11:34:00 2014 -0700 Committer: Anthony Xu <[email protected]> Committed: Tue Apr 29 11:34:00 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/282c9da6/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 1883371..4a039c6 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 @@ -99,7 +99,7 @@ public class XenServerResourceNewBase extends XenServer620SP1Resource { return cmds; } - 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 +
