From fae1c0c054ef2c55c2b54c248192b7d4991a8908 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Fri, 12 Nov 2010 16:41:31 -0800
Subject: [PATCH] fix build

---
 .../xen/resource/XenServerConnectionPool.java | 27 +++++++++++--------
 .../consoleproxy/ConsoleProxyManagerImpl.java |  7 ++---
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java b/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
index d4ef72350a8..19854d35fec 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
@@ -149,11 +149,8 @@ public class XenServerConnectionPool {
                     slaveConn.dispose();
                     slaveConn = null;
                 }
-
             }
-
         }
-
         throw new CloudRuntimeException(
                 "Unable to logon to the new master after " + retry + " retries");
     }
@@ -448,31 +445,39 @@ public class XenServerConnectionPool {
             // wait 10 second
             forceSleep(10);
             for(Host slave : slaves ) {
-                for (int i = 0; i < 30; i++) {
+                Session slaveSession = null;
+                for (int i = 0; i < 10; i++) {
                     Connection slaveConn = null;
                     try {
                         
                         String slaveIp = slave.getAddress(conn);
-                        s_logger.debug("Logging on as the slave to " + slaveIp);
+                        s_logger.debug("ensurePoolIntegrity: trying to logon as the slave to " + slaveIp);
                         URL slaveUrl = new URL("http://" + slaveIp);
                         slaveConn = new Connection(slaveUrl, 10);
-                        Session.slaveLocalLoginWithPassword(slaveConn, username, password);
+                        slaveSession = null;
+                        try {
+                        	slaveSession = Session.slaveLocalLoginWithPassword(slaveConn, username, password);
+                        } catch (Exception e) {
+                        	s_logger.debug("ensurePoolIntegrity: Unable to logging on as the slave to " + slaveIp);
+                        	break;
+                        }
                         Pool.Record pr = getPoolRecord(slaveConn);
                         String mIp = pr.master.getAddress(slaveConn);
                         if (mIp.trim().equals(masterIp.trim())) {
                             break;
                         }
                     } catch (Exception e) {
-                        try {
-                            Session.localLogout(slaveConn);
-                        } catch (Exception e1) {
+                        if (slaveSession != null) {
+                            try {
+                                Session.localLogout(slaveConn);
+                            } catch (Exception e1) {
+                            }
                         }
                         slaveConn.dispose();
                     }
                     // wait 2 second
                     forceSleep(2);
-                }
-                
+                }             
             }
         } catch (Exception e) {
         }
diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 190c67b8c16..84befa66ecf 100644
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -564,8 +564,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager,
 
 			DataCenterVO dc = _dcDao.findById(proxy.getDataCenterId());
 			HostPodVO pod = _podDao.findById(proxy.getPodId());
-			List<StoragePoolVO> sps = _storageMgr.getStoragePoolsForVm(proxy.getId());
-			StoragePoolVO sp = sps.get(0); // FIXME
+			StoragePoolVO sp = _storageMgr.getStoragePoolForVm(proxy.getId());
 
 			HashSet<Host> avoid = new HashSet<Host>();
 			HostVO routingHost = (HostVO) _agentMgr.findHost(Host.Type.Routing,
@@ -2379,9 +2378,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager,
 		boolean mirroredVols = proxy.isMirroredVols();
 		DataCenterVO dc = _dcDao.findById(proxy.getDataCenterId());
 		HostPodVO pod = _podDao.findById(proxy.getPodId());
-		List<StoragePoolVO> sps = _storageMgr.getStoragePoolsForVm(proxy
-				.getId());
-		StoragePoolVO sp = sps.get(0); // FIXME
+		StoragePoolVO sp = _storageMgr.getStoragePoolForVm(proxy.getId());
 
 		List<VolumeVO> vols = _volsDao.findCreatedByInstance(routerId);