From 606779b300f2cab3aab99363aa4d9bbd735f648f Mon Sep 17 00:00:00 2001
From: kishan <kishan@cloud.com>
Date: Tue, 8 Nov 2011 15:53:32 +0530
Subject: [PATCH] bug 11851: When Add VPN user fails, remove the user entry
 from db instead of leaving in Add state. status 11851: resolved fixed
 reviewed-by: Abhi

---
 .../src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
index cb7615ab3cf..760976e6e82 100755
--- a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
@@ -442,6 +442,9 @@ public class RemoteAccessVpnManagerImpl implements RemoteAccessVpnService, Manag
                     _vpnUsersDao.remove(user.getId());
                 }
             } else {
+            	if (user.getState() == State.Add) {
+                    _vpnUsersDao.remove(user.getId());
+                }
                 s_logger.warn("Failed to apply vpn for user " + user.getUsername() + ", accountId=" + user.getAccountId());
             }
         }