From a82ee7715e9e9a33c6924359fef9060cee002151 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Mon, 24 Sep 2012 16:39:01 -0700 Subject: [PATCH] CLOUDSTACK-191: Update checking for updateCustomerGateway Reviewed-by: Anthony Xu Conflicts: server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java --- .../com/cloud/network/vpn/Site2SiteVpnManagerImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java index db678ae694c..ae0f4ec7fa1 100644 --- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java +++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java @@ -468,12 +468,14 @@ public class Site2SiteVpnManagerImpl implements Site2SiteVpnManager, Manager { } checkCustomerGatewayCidrList(guestCidrList); - + long accountId = gw.getAccountId(); - if (_customerGatewayDao.findByGatewayIp(gatewayIp) != null) { + Site2SiteCustomerGatewayVO existedGw = _customerGatewayDao.findByGatewayIp(gatewayIp); + if (existedGw != null && existedGw.getId() != gw.getId()) { throw new InvalidParameterValueException("The customer gateway with ip " + gatewayIp + " already existed in the system!"); } - if (_customerGatewayDao.findByNameAndAccountId(name, accountId) != null) { + existedGw = _customerGatewayDao.findByNameAndAccountId(name, accountId); + if (existedGw != null && existedGw.getId() != gw.getId()) { throw new InvalidParameterValueException("The customer gateway with name " + name + " already existed!"); }