Merge remote-tracking branch 'origin/master'

This commit is contained in:
geek 2018-06-20 21:09:22 +09:00
commit 9470d74d81

View File

@ -153,8 +153,7 @@ public class CentralInfraService implements InfraService {
InfraHostIP eInfraHostIP = this.infraHostIPService.readByInfraHostInfraZoneIDAndMetaIPTypeKeyAndAddress(
infraZone.getId(), infraHostIP.getMetaIPType().getKey(), host.getAddress());
if (null != eInfraHostIP) {
throw new OverflowException(String.format("IP[%s(%s)] of Zone[%s] is exist already", host.getAddress(),
infraHostIP.getMetaIPType().getName(), infraZone.getNetwork()));
return eInfraHostIP.getInfraHost();
}
InfraHost infraHost = new InfraHost();