incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [9/50] [abbrv] git commit: S2S VPN: CS-15932: Allow user to update customer gateway when connection state is ERROR
Date Sun, 12 Aug 2012 20:20:33 GMT
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 <sheng.yang@citrix.com>
Authored: Fri Aug 10 11:50:21 2012 -0700
Committer: Sheng Yang <sheng.yang@citrix.com>
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<Site2SiteVpnConnectionVO> 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!");
                 }
             }
         }


Mime
View raw message