From 984f9290ae637196a06f22d160761417068f7ddc Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Fri, 27 Jul 2012 15:07:36 -0700 Subject: [PATCH] CS-15717: fail to delete the network when corresponding network elements fail to be destroyed --- server/src/com/cloud/network/NetworkManagerImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 9bb2ae3c147..18a50cd09b7 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -3625,7 +3625,10 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag s_logger.debug("Sending destroy to " + element); } - element.destroy(network); + if (!element.destroy(network)) { + success = false; + s_logger.warn("Unable to complete destroy of the network: failed to destroy network element " + element.getName()); + } } catch (ResourceUnavailableException e) { s_logger.warn("Unable to complete destroy of the network due to element: " + element.getName(), e); success = false; @@ -3635,7 +3638,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag } catch (Exception e) { s_logger.warn("Unable to complete destroy of the network due to element: " + element.getName(), e); success = false; - } + } } }