From 1d49275ca8e5a9ff48973dfcb158c41afb2bcc50 Mon Sep 17 00:00:00 2001
From: Edison Su <edison@cloud.com>
Date: Thu, 4 Aug 2011 14:26:14 -0700
Subject: [PATCH] release capacity if current state is in starting and not
 transit to running

---
 server/src/com/cloud/capacity/CapacityManagerImpl.java | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java
index 8273e77509b..181d8d5416e 100755
--- a/server/src/com/cloud/capacity/CapacityManagerImpl.java
+++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java
@@ -617,13 +617,7 @@ public class CapacityManagerImpl implements CapacityManager, StateListener<State
                 + vm.getLastHostId() + " new host id: " + vm.getHostId() + " host id before state transition: " + oldHostId);
 
         if (oldState == State.Starting) {
-            if (event == Event.OperationFailed) {
-                releaseVmCapacity(vm, false, false, oldHostId);
-            } else if (event == Event.OperationRetry) {
-                releaseVmCapacity(vm, false, false, oldHostId);
-            } else if (event == Event.AgentReportStopped) {
-                releaseVmCapacity(vm, false, false, oldHostId);
-            } else if(event == Event.AgentReportMigrated) {
+            if(newState != State.Running) {
             	releaseVmCapacity(vm, false, false, oldHostId);
             }
         } else if (oldState == State.Running) {