From 3e240d1a00535264802c880611b588eba4e1c1bc Mon Sep 17 00:00:00 2001 From: Anthony Xu Date: Tue, 29 Apr 2014 11:48:12 -0700 Subject: [PATCH] disable XS event (cherry picked from commit 1b74f3f3c864db55e3cd8e1f704c35b81d97ffbf) --- .../hypervisor/xenserver/XenServerResourceNewBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d11db0de838..a60fca08775 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 +