From cedf128ae4ba1fbc8a4c384ab4c44e7622a9f162 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Wed, 25 Jul 2012 11:19:32 -0700
Subject: [PATCH] CS-15691 : network objec might be deleted by other host

---
 .../cloud/hypervisor/xen/resource/CitrixResourceBase.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 9ed7a4aa04b..25a6ea148b5 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -3540,8 +3540,12 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
                             // Disable any VLAN networks that aren't used
                             // anymore
                             for (Network network : networks) {
-                                if (network.getNameLabel(conn).startsWith("VLAN")) {
-                                    disableVlanNetwork(conn, network);
+                                try {
+                                    if (network.getNameLabel(conn).startsWith("VLAN")) {
+                                        disableVlanNetwork(conn, network);
+                                    }
+                                } catch (Exception e) {
+                                    // network might be destroyed by other host
                                 }
                             }
                             return new StopAnswer(cmd, "Stop VM " + vmName + " Succeed", 0, true);