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 routers = findOrCreateVirtualRouters(guestNetwork, dest, owner, isRedundant); - List runningRouters = new ArrayList(); + List runningRouters = null; - if (routers == null) { - return runningRouters; + if (routers != null) { + runningRouters = new ArrayList(); } 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());