You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2012/07/26 04:27:45 UTC
git commit: S2S VPN: Fix incorrect conn returned by
resetVpnConnection cmd
Updated Branches:
refs/heads/vpc 6420ecbd6 -> 522bdf816
S2S VPN: Fix incorrect conn returned by resetVpnConnection cmd
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/522bdf81
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/522bdf81
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/522bdf81
Branch: refs/heads/vpc
Commit: 522bdf8163c99ac57678c693ed94fc918c3bd1bf
Parents: 6420ecb
Author: Sheng Yang <sh...@citrix.com>
Authored: Tue Jul 24 12:50:41 2012 -0700
Committer: Sheng Yang <sh...@citrix.com>
Committed: Wed Jul 25 19:27:16 2012 -0700
----------------------------------------------------------------------
.../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/522bdf81/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 3ca1a7e..696e4c0 100644
--- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
@@ -344,6 +344,7 @@ public class Site2SiteVpnManagerImpl implements Site2SiteVpnManager, Manager {
stopVpnConnection(id);
}
startVpnConnection(id);
+ conn = _vpnConnectionDao.findById(id);
return conn;
}