From f85880c2a650bfc2c7cc947a04e4124f21082626 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@cloud.com>
Date: Tue, 9 Aug 2011 15:58:10 -0700
Subject: [PATCH] Revert "Catch domr creation exception"

This reverts commit 6d55408e1f0e1c98fe2a9d4cf51babc6a3308a14.
---
 .../VirtualNetworkApplianceManagerImpl.java     | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 283e63212d6..5c38b04a177 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -940,11 +940,6 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
             }
 
             txn.commit();
-        } catch (InsufficientCapacityException ex) {
-            s_logger.error("Fail to create the virtual router!", ex);
-            throw ex;
-        } catch (Exception ex) {
-            s_logger.error("Fail to create the virtual router due to error: " + ex.getMessage());
         } finally {
             if (network != null) {
                 _networkDao.releaseFromLockTable(network.getId());
@@ -1023,10 +1018,10 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
         assert guestNetwork.getTrafficType() == TrafficType.Guest;
 
         List<DomainRouterVO> routers = findOrCreateVirtualRouters(guestNetwork, dest, owner, isRedundant);
-        List<DomainRouterVO> runningRouters = new ArrayList<DomainRouterVO>();
+        List<DomainRouterVO> runningRouters = null;
         
-        if (routers == null) {
-            return runningRouters;
+        if (routers != null) {
+            runningRouters = new ArrayList<DomainRouterVO>();
         }
         
         for (DomainRouterVO router : routers) {
@@ -1123,11 +1118,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
             }
 
             txn.commit();
-        } catch (InsufficientCapacityException ex) {
-            s_logger.error("Fail to create the virtual router!", ex);
-            throw ex;
-        } catch (Exception ex) {
-            s_logger.error("Fail to create the virtual router due to error: " + ex.getMessage());
+
         } finally {
             if (network != null) {
                 _networkDao.releaseFromLockTable(network.getId());