From 6d691f0021947a1e64737edd940acca971607a99 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Tue, 15 Mar 2011 16:41:49 -0700
Subject: [PATCH]     bug 8480: allow multiple hosts in maintenance mode

    status 8480: resolved fixed
---
 server/src/com/cloud/server/ManagementServerImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index a3ce9e432ae..99678d1d894 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -697,8 +697,8 @@ public class ManagementServerImpl implements ManagementServer {
             throw new InvalidParameterValueException("Unable to find host with ID: " + hostId + ". Please specify a valid host ID.");
         }
         
-        if (_hostDao.countBy(host.getClusterId(), Status.PrepareForMaintenance, Status.ErrorInMaintenance, Status.Maintenance) > 0) {
-            throw new InvalidParameterValueException("There are other servers in maintenance mode.");
+        if (_hostDao.countBy(host.getClusterId(), Status.PrepareForMaintenance, Status.ErrorInMaintenance) > 0) {
+            throw new InvalidParameterValueException("There are other servers in PrepareForMaintenance OR ErrorInMaintenance STATUS in cluster " + host.getClusterId());
         }
         
         if (_storageMgr.isLocalStorageActiveOnHost(host)) {