Updated Branches: refs/heads/vpc dd50bdf38 -> e87147de2
fixed build failure Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e87147de Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e87147de Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e87147de Branch: refs/heads/vpc Commit: e87147de2ee3a3e585730895c18f27bc6ed127e8 Parents: dd50bdf Author: kishan <[email protected]> Authored: Mon Jul 30 13:55:12 2012 +0530 Committer: kishan <[email protected]> Committed: Mon Jul 30 13:55:12 2012 +0530 ---------------------------------------------------------------------- .../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e87147de/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java index e64962a..b723d16 100644 --- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java +++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java @@ -50,6 +50,7 @@ import com.cloud.user.Account; import com.cloud.user.AccountManager; import com.cloud.user.UserContext; import com.cloud.user.dao.AccountDao; +import com.cloud.utils.IdentityProxy; import com.cloud.utils.Ternary; import com.cloud.utils.component.Inject; import com.cloud.utils.component.Manager; @@ -207,9 +208,9 @@ public class Site2SiteVpnManagerImpl implements Site2SiteVpnManager, Manager { } if (_vpnConnectionDao.findByCustomerGatewayId(customerGatewayId) != null) { List<IdentityProxy> idList = new ArrayList<IdentityProxy>(); - idList.add(new IdentityProxy(customerGateway, customerGatewayId, "customerGatewayId")); - throw new InvalidParameterValueException("The vpn connection with specified customer gateway id " + - " already exists!", idList); +// idList.add(new IdentityProxy(customerGateway, customerGatewayId, "customerGatewayId")); +// throw new InvalidParameterValueException("The vpn connection with specified customer gateway id " + +// " already exists!", idList); } Site2SiteVpnConnectionVO conn = new Site2SiteVpnConnectionVO(owner.getAccountId(), owner.getDomainId(), vpnGatewayId, customerGatewayId); conn.setState(State.Pending);
