etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Catch domr creation exception" 

This reverts commit 6d55408e1f0e1c98fe2a9d4cf51babc6a3308a14.
This commit is contained in:
Sheng Yang 2011-08-09 15:58:10 -07:00
parent 8d37b98300
commit f85880c2a6
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View File

@ -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());