You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2014/04/30 19:43:40 UTC
git commit: updated refs/heads/4.4 to 376078e
Repository: cloudstack
Updated Branches:
refs/heads/4.4 2239eb4b1 -> 376078e90
Revert "disble XS event, found there is an issue when event.from is called by multiple thread."
This reverts commit 8696f386dd73baf0b8281166a75195b3570e3436.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/376078e9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/376078e9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/376078e9
Branch: refs/heads/4.4
Commit: 376078e90f465e4d5ed67af16c7c4a112e426dff
Parents: 2239eb4
Author: Anthony Xu <an...@citrix.com>
Authored: Wed Apr 30 10:38:13 2014 -0700
Committer: Anthony Xu <an...@citrix.com>
Committed: Wed Apr 30 10:38:13 2014 -0700
----------------------------------------------------------------------
.../hypervisor/xenserver/XenServerResourceNewBase.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/376078e9/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 f93de32..d11db0d 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
@@ -31,12 +31,11 @@ import com.xensource.xenapi.Types.XenAPIException;
import com.xensource.xenapi.VM;
import com.xensource.xenapi.Event;
-/*
import com.xensource.xenapi.Task;
import com.xensource.xenapi.Types;
-import java.util.concurrent.TimeoutException;
-*/
import org.apache.xmlrpc.XmlRpcException;
+import java.util.concurrent.TimeoutException;
+
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.ClusterSyncAnswer;
@@ -102,7 +101,7 @@ public class XenServerResourceNewBase extends XenServer620SP1Resource {
return cmds;
}
-/*
+
protected void waitForTask(Connection c, Task task, long pollInterval, long timeout) throws XenAPIException, XmlRpcException, TimeoutException {
long beginTime = System.currentTimeMillis();
if (s_logger.isTraceEnabled()) {
@@ -155,7 +154,7 @@ public class XenServerResourceNewBase extends XenServer620SP1Resource {
}
}
-*/
+
@Override
protected Answer execute(final ClusterSyncCommand cmd) {