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 2013/12/11 02:33:24 UTC
git commit: updated refs/heads/4.3 to dadcc8a
Updated Branches:
refs/heads/4.3 8533c1670 -> dadcc8a38
CLOUDSTACK-5453: Fix VPN connection monitoring in KVM
It's broken by:
commit 7f104b1feb489ae09b1a2060262a122deda44a8e
Author: Edison Su <su...@gmail.com>
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/dadcc8a3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dadcc8a3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dadcc8a3
Branch: refs/heads/4.3
Commit: dadcc8a3862fee0636425c9cca754ae7a0a1c159
Parents: 8533c16
Author: Sheng Yang <sh...@citrix.com>
Authored: Tue Dec 10 17:32:00 2013 -0800
Committer: Sheng Yang <sh...@citrix.com>
Committed: Tue Dec 10 17:33:15 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/dadcc8a3/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 b124aa6..609bcf6 100755
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -667,7 +667,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);