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

bug 10286: When router API fails, throw error instead of returning null 

status 10286: resolved fixed
This commit is contained in:
kishan 2011-11-09 15:02:05 +05:30
parent 4f263a56b2
commit 2a620fa5ed
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -494,7 +494,11 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
UserVO user = _userDao.findById(UserContext.current().getCallerUserId());
return stop(router, forced, user, account);
VirtualRouter virtualRouter = stop(router, forced, user, account);
if(virtualRouter == null){
throw new CloudRuntimeException("Failed to stop router with id " + routerId);
}
return virtualRouter;
}
@DB
@ -2178,7 +2182,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
@Override @ActionEvent(eventType = EventTypes.EVENT_ROUTER_START, eventDescription = "starting router Vm", async = true)
public VirtualRouter startRouter(long id) throws ResourceUnavailableException, InsufficientCapacityException, ConcurrentOperationException{
return startRouter(id, true);
return startRouter(id, true);
}
@Override
@ -2221,7 +2225,11 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
} else {
params.put(Param.RestartNetwork, false);
}
return startVirtualRouter(router, user, caller, params);
VirtualRouter virtualRouter = startVirtualRouter(router, user, caller, params);
if(virtualRouter == null){
throw new CloudRuntimeException("Failed to start router with id " + routerId);
}
return virtualRouter;
}
private void createAssociateIPCommands(final VirtualRouter router, final List<? extends PublicIpAddress> ips, Commands cmds, long vmId) {