From 346ee18f6ac3a4464b66a7818191712eeb9cf44f Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Fri, 6 May 2011 15:44:45 -0700
Subject: [PATCH] fix a regression in ConsoleProxyManagerImpl.java

---
 .../com/cloud/consoleproxy/ConsoleProxyManagerImpl.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 66b1ef0dc87..1d0fbf57c6c 100644
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -314,11 +314,11 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProx
                             }
                         }
                     }
-            		
-                    if (proxy == null) {
-                        proxy = assignProxyFromRunningPool(dataCenterId);
-                    }
             	}
+            	
+                if (proxy == null) {
+                    proxy = assignProxyFromRunningPool(dataCenterId);
+                }
             } finally {
                 _allocProxyLock.unlock();
             }