From 3d33fd7f9255001b1c0c24250f436c41ff4e8863 Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Thu, 21 Apr 2011 11:15:51 -0700
Subject: [PATCH] deleteNetwork: return false when fail to cleanup network
 resources (LB/PF/StaticNat rules)

---
 server/src/com/cloud/network/NetworkManagerImpl.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 4fd0c773a05..2f9a12194a8 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -2001,7 +2001,10 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
 
         boolean success = true;
 
-        cleanupNetworkResources(networkId, callerAccount, context.getCaller().getId());
+        if (!cleanupNetworkResources(networkId, callerAccount, context.getCaller().getId())) {
+            s_logger.warn("Unable to delete network id=" + networkId + ": failed to cleanup network resources");
+            return false;
+        }
 
         for (NetworkElement element : _networkElements) {
             try {