Updated Branches: refs/heads/master 1767ddac7 -> cae19d0b5
fix build Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cae19d0b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cae19d0b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cae19d0b Branch: refs/heads/master Commit: cae19d0b5a271171dc574779c136c247a27d6e42 Parents: 1767dda Author: Anthony Xu <anthony...@citrix.com> Authored: Tue Jan 21 19:34:32 2014 -0800 Committer: Anthony Xu <anthony...@citrix.com> Committed: Tue Jan 21 19:34:54 2014 -0800 ---------------------------------------------------------------------- .../xen/resource/CitrixResourceBase.java | 2 +- .../xen/resource/XenServerConnectionPool.java | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cae19d0b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index 9abfee3..ed9eec1 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -6009,7 +6009,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe } private void CheckXenHostInfo() throws ConfigurationException { - Connection conn = _connPool.getConnect(_host.ip, _username, _password); + Connection conn = ConnPool.getConnect(_host.ip, _username, _password); if( conn == null ) { throw new ConfigurationException("Can not create connection to " + _host.ip); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cae19d0b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java index 572d08e..b779085 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java @@ -207,7 +207,7 @@ public class XenServerConnectionPool { return false; } - + public Connection getConnect(String ip, String username, Queue<String> password) { Connection conn = new Connection(getURL(ip), 10); try { @@ -220,12 +220,12 @@ public class XenServerConnectionPool { } catch (Exception e1) { String msg = "Unable to create master connection to host(" + maddress +") , due to " + e1.toString(); s_logger.debug(msg); - throw new CloudRuntimeException(msg, e1); + throw new CloudRuntimeException(msg, e1); } } catch (Exception e) { String msg = "Unable to create master connection to host(" + ip +") , due to " + e.toString(); s_logger.debug(msg); - throw new CloudRuntimeException(msg, e); + throw new CloudRuntimeException(msg, e); } return conn; } @@ -255,15 +255,15 @@ public class XenServerConnectionPool { if (mConn != null){ try{ Host.getByUuid(mConn, hostUuid); - } catch (Exception e) { + } catch (Exception e) { if (s_logger.isDebugEnabled()) { s_logger.debug("connect through IP(" + mConn.getIp() + " for pool(" + poolUuid + ") is broken due to " + e.toString()); } removeConnect(poolUuid); mConn = null; } - } - + } + if ( mConn == null ) { mConn = new XenServerConnection(getURL(ipAddress), ipAddress, username, password, _retries, _interval, wait); try { @@ -277,12 +277,12 @@ public class XenServerConnectionPool { String msg = "Unable to create master connection to host(" + maddress +") , due to " + e1.toString(); s_logger.debug(msg); throw new CloudRuntimeException(msg, e1); - - } + + } } catch (Exception e) { String msg = "Unable to create master connection to host(" + ipAddress +") , due to " + e.toString(); s_logger.debug(msg); - throw new CloudRuntimeException(msg, e); + throw new CloudRuntimeException(msg, e); } addConnect(poolUuid, mConn); }
