From cfedc7c18f2d72c3adb037dbeffe54c08d14fd4f Mon Sep 17 00:00:00 2001 From: anthony Date: Sun, 29 Aug 2010 15:43:18 -0700 Subject: [PATCH] clean up disableVlanNetwork --- .../cloud/hypervisor/xen/resource/CitrixResourceBase.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index 6f2bac2c897..f8a3f4f1529 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -17,6 +17,7 @@ */ package com.cloud.hypervisor.xen.resource; + import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -3358,13 +3359,9 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR } catch (XenAPIException e) { String msg = "Unable to disable VLAN network due to " + e.toString(); s_logger.warn(msg, e); - throw new InternalErrorException(msg); - } catch (XmlRpcException e) { + } catch (Exception e) { String msg = "Unable to disable VLAN network due to " + e.getMessage(); s_logger.warn(msg, e); - throw new InternalErrorException(msg); - } catch (Exception e) { - throw new InternalErrorException(e.getMessage()); } }