From e02682327dab607ef52c4a925081b31b1c574a2b Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Tue, 10 Dec 2013 17:32:00 -0800 Subject: [PATCH] CLOUDSTACK-5453: Fix VPN connection monitoring in KVM It's broken by: commit 7f104b1feb489ae09b1a2060262a122deda44a8e Author: Edison Su Date: Fri Oct 12 18:24:50 2012 -0700 [PATCH] CLOUDSTACK-335: fix lb for vpc on kvm --- .../agent/resource/virtualnetwork/VirtualRoutingResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java index 34450fe1601..15f1c40e3ce 100755 --- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java +++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java @@ -663,7 +663,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);