Return-Path: 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 E8010DB69 for ; Sun, 12 Aug 2012 20:20:34 +0000 (UTC) Received: (qmail 57301 invoked by uid 500); 12 Aug 2012 20:20:33 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 57229 invoked by uid 500); 12 Aug 2012 20:20:33 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 57076 invoked by uid 99); 12 Aug 2012 20:20:33 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 12 Aug 2012 20:20:33 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 605711CA7A; Sun, 12 Aug 2012 20:20:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: alena1108@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [9/50] [abbrv] git commit: S2S VPN: CS-15932: Allow user to update customer gateway when connection state is ERROR Message-Id: <20120812202033.605711CA7A@tyr.zones.apache.org> Date: Sun, 12 Aug 2012 20:20:33 +0000 (UTC) S2S VPN: CS-15932: Allow user to update customer gateway when connection state is ERROR Conflicts: server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/302c9048 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/302c9048 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/302c9048 Branch: refs/heads/master Commit: 302c9048e85f7d9ef5a72b811fed00a3165457bd Parents: 830aec3 Author: Sheng Yang Authored: Fri Aug 10 11:50:21 2012 -0700 Committer: Sheng Yang Committed: Fri Aug 10 16:20:52 2012 -0700 ---------------------------------------------------------------------- .../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/302c9048/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 438ce47..a48d5d4 100644 --- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java +++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java @@ -383,8 +383,8 @@ public class Site2SiteVpnManagerImpl implements Site2SiteVpnManager, Manager { List conns = _vpnConnectionDao.listByCustomerGatewayId(id); if (conns != null) { for (Site2SiteVpnConnection conn : conns) { - if (conn.getState() != State.Disconnected || conn.getState() != State.Error) { - throw new InvalidParameterValueException("Unable to update customer gateway because there is active VPN connection " + conn.getId()); + if (conn.getState() != State.Error) { + throw new InvalidParameterValueException("Unable to update customer gateway with connections in non-Error state!"); } } }