ctripcorp/zeus
1
1
Fork 0
mirror of https://github.com/ctripcorp/zeus.git synced 2024-11-10 17:13:46 +08:00
Code Issues Projects Releases Packages Wiki Activity

bug fix

Browse source
This commit is contained in:
Mengyi Zhou 2016-12-27 16:35:45 +08:00
parent 2ede271d36
commit cc3bdf821c
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/ctrip/zeus/restful/resource/DeactivateResource.java
View file

@ -260,8 +260,6 @@ public class DeactivateResource {
throw new ValidationException("Cannot find vs by id " + vsId + ".");
}
authService.authValidate(UserUtils.getUserName(request), ResourceOperationType.ACTIVATE, ResourceDataType.Vs, vsId);
ModelStatusMapping<Slb> slbMap = entityFactory.getSlbsByIds(new Long[]{slbId});
Slb slb = slbMap.getOnlineMapping().get(slbId);
if (slb == null) {

2
src/main/java/com/ctrip/zeus/service/model/handler/impl/DefaultSlbValidator.java
View file

@ -71,7 +71,7 @@ public class DefaultSlbValidator implements SlbValidator {
}
}
if (check.size() == 0)
return;
continue;
check.remove(slb.getId());
if (check.size() > 0) {
throw new ValidationException("Slb server " + slbServer.getIp() + " exists in the system. Unique server ip is required.");