You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2012/08/02 01:41:56 UTC
git commit: Build fix.
Updated Branches:
refs/heads/vpc a90244370 -> 904ef7339
Build fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/904ef733
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/904ef733
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/904ef733
Branch: refs/heads/vpc
Commit: 904ef73398b4be731735573906f5e98c3bef339b
Parents: a902443
Author: Sheng Yang <sh...@citrix.com>
Authored: Wed Aug 1 16:41:38 2012 -0700
Committer: Sheng Yang <sh...@citrix.com>
Committed: Wed Aug 1 16:41:38 2012 -0700
----------------------------------------------------------------------
.../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/904ef733/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 83fc102..9fe212b 100644
--- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
@@ -214,10 +214,8 @@ public class Site2SiteVpnManagerImpl implements Site2SiteVpnManager, Manager {
String vpcCidr = _vpcDao.findById(vpnGateway.getVpcId()).getCidr();
for (String cidr : cidrList) {
if (NetUtils.isNetworksOverlap(vpcCidr, cidr)) {
- List<IdentityProxy> idList = new ArrayList<IdentityProxy>();
- idList.add(new IdentityProxy(customerGateway, customerGatewayId, "customerGatewayId"));
- throw new InvalidParameterValueException("The subnet of customer gateway " + cidr + " is overlapped with VPC cidr " +
- vpcCidr + "!", idList);
+ throw new InvalidParameterValueException("The subnet of customer gateway " + customerGatewayId + "'s subnet " + cidr + " is overlapped with VPC cidr " +
+ vpcCidr + "!");
}
}