Updated Branches: refs/heads/4.2 15b7b1082 -> 7d7bd2afd
CLOUDSTACK-4836: Fix VPN user are not programmed after restart network Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7d7bd2af Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7d7bd2af Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7d7bd2af Branch: refs/heads/4.2 Commit: 7d7bd2afdf4fcf9ddf06080f041ec0bbebf5d2f0 Parents: 15b7b10 Author: Sheng Yang <sheng.y...@citrix.com> Authored: Thu Oct 17 18:07:42 2013 -0700 Committer: Sheng Yang <sheng.y...@citrix.com> Committed: Thu Oct 17 18:08:23 2013 -0700 ---------------------------------------------------------------------- .../cloud/network/router/VirtualNetworkApplianceManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7d7bd2af/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index 816924f..900d0c9 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -3346,7 +3346,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V List<VpnUser> addUsers = new ArrayList<VpnUser>(); List<VpnUser> removeUsers = new ArrayList<VpnUser>(); for (VpnUser user : vpnUsers) { - if (user.getState() == VpnUser.State.Add) { + if (user.getState() == VpnUser.State.Add || user.getState() == VpnUser.State.Active) { addUsers.add(user); } else if (user.getState() == VpnUser.State.Revoke) { removeUsers.add(user);
