From 0bbefcecff5aedf700aeedb6ba245614500dd0f2 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@citrix.com>
Date: Fri, 10 Aug 2012 11:50:21 -0700
Subject: [PATCH] S2S VPN: CS-15932: Allow user to update customer gateway when
 connection state is ERROR

---
 server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
index fdafb410e1d..64796fec266 100644
--- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
@@ -409,10 +409,10 @@ 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) {
+                if (conn.getState() != State.Error) {
                     List<IdentityProxy> idList = new ArrayList<IdentityProxy>();
                     idList.add(new IdentityProxy(conn, conn.getId(), "vpnConnectionId"));
-                    throw new InvalidParameterValueException("Unable to update customer gateway because there is an active VPN connection with specified vpn connection id", idList);
+                    throw new InvalidParameterValueException("Unable to update customer gateway with connections in non-Error state!", idList);
                 }
             }
         }