Updated Branches: refs/heads/4.2 95b5202ef -> 3017b416f
CLOUDSTACK-5453: Fix VPN connection monitoring in KVM It's broken by: commit 7f104b1feb489ae09b1a2060262a122deda44a8e Author: Edison Su <[email protected]> Date: Fri Oct 12 18:24:50 2012 -0700 [PATCH] CLOUDSTACK-335: fix lb for vpc on kvm Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3017b416 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3017b416 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3017b416 Branch: refs/heads/4.2 Commit: 3017b416f0d794c46d63c0c8e33d6d6b66fdfb53 Parents: 95b5202 Author: Sheng Yang <[email protected]> Authored: Tue Dec 10 17:32:00 2013 -0800 Committer: Sheng Yang <[email protected]> Committed: Tue Dec 10 17:35:32 2013 -0800 ---------------------------------------------------------------------- .../agent/resource/virtualnetwork/VirtualRoutingResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3017b416/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java index 0fc6dd1..b18e52f 100755 --- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java +++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java @@ -668,7 +668,7 @@ public class VirtualRoutingResource implements Manager { } final String result = routerProxy("checkbatchs2svpn.sh", routerIP, args); - if (result != null) { + if (result == null || result.isEmpty()) { return new CheckS2SVpnConnectionsAnswer(cmd, false, "CheckS2SVpnConneciontsCommand failed"); } return new CheckS2SVpnConnectionsAnswer(cmd, true, result);
