etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "disble XS event, found there is an issue when event.from is called by multiple thread." 

This reverts commit 8696f386dd.
This commit is contained in:
Anthony Xu 2014-04-30 10:38:13 -07:00
parent 2239eb4b17
commit 376078e90f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/hypervisors/xen/src/org/apache/cloudstack/hypervisor/xenserver/XenServerResourceNewBase.java
View File

@ -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) {