From 7a0902fd7462b169cf8bf54f5f000327486e0ff8 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Wed, 6 Oct 2010 16:04:52 -0700
Subject: [PATCH] bug 6440: reconnect host after setupcommand

status 6440: resolved fixed
---
 .../storage/secondary/SecondaryStorageManagerImpl.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
index a43505dda39..af19740419d 100644
--- a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
+++ b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
@@ -701,13 +701,13 @@ public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, V
 					dataCenterId, (1L << 31));
 			String guestMacAddress = macAddresses[0];
 			while ((pod = _agentMgr.findPod(_template, _serviceOffering, dc, Account.ACCOUNT_ID_SYSTEM, avoidPods)) != null){
+				avoidPods.add(pod.first().getId());
 				publicIpAndVlan = allocPublicIpAddress(dataCenterId, pod.first().getId(), publicMacAddress);
-				if (publicIpAndVlan == null) {
-					s_logger.warn("Unable to allocate public IP address for secondary storage vm in data center : " + dataCenterId + ", pod="+ pod.first().getId());
-					avoidPods.add(pod.first().getId());
-				} else {
+				if (publicIpAndVlan != null) {
 					break;
 				}
+     			s_logger.warn("Unable to allocate public IP address for secondary storage vm in data center : " + dataCenterId + ", pod="+ pod.first().getId());
+
 			}
 			
 			if (pod == null || publicIpAndVlan == null) {