Return-Path: 
 <cloudstack-commits-return-1737-apmail-incubator-cloudstack-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 7A417D8E3
	for <apmail-incubator-cloudstack-commits-archive@minotaur.apache.org>;
 Wed,  1 Aug 2012 23:41:57 +0000 (UTC)
Received: (qmail 81374 invoked by uid 500); 1 Aug 2012 23:41:57 -0000
Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org
Received: (qmail 81344 invoked by uid 500); 1 Aug 2012 23:41:57 -0000
Mailing-List: contact cloudstack-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:cloudstack-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:cloudstack-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:cloudstack-commits@incubator.apache.org>
List-Id: <cloudstack-commits.incubator.apache.org>
Reply-To: cloudstack-dev@incubator.apache.org
Delivered-To: mailing list cloudstack-commits@incubator.apache.org
Received: (qmail 81334 invoked by uid 99); 1 Aug 2012 23:41:57 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Aug 2012 23:41:57 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id EA6F11B1FC; Wed,  1 Aug 2012 23:41:56 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: yasker@apache.org
To: cloudstack-commits@incubator.apache.org
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: Build fix.
Message-Id: <20120801234156.EA6F11B1FC@tyr.zones.apache.org>
Date: Wed,  1 Aug 2012 23:41:56 +0000 (UTC)

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 <sheng.yang@citrix.com>
Authored: Wed Aug 1 16:41:38 2012 -0700
Committer: Sheng Yang <sheng.yang@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 + "!");
             }
         }