From 302c9048e85f7d9ef5a72b811fed00a3165457bd 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

Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
---
 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 438ce47c186..a48d5d46beb 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!");
                 }
             }
         }