cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yas...@apache.org
Subject git commit: updated refs/heads/master to e026823
Date Wed, 11 Dec 2013 01:36:17 GMT
Updated Branches:
  refs/heads/master 28a4bfc55 -> e02682327


CLOUDSTACK-5453: Fix VPN connection monitoring in KVM

It's broken by:

commit 7f104b1feb489ae09b1a2060262a122deda44a8e
Author: Edison Su <sudison@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/e0268232
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e0268232
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e0268232

Branch: refs/heads/master
Commit: e02682327dab607ef52c4a925081b31b1c574a2b
Parents: 28a4bfc
Author: Sheng Yang <sheng.yang@citrix.com>
Authored: Tue Dec 10 17:32:00 2013 -0800
Committer: Sheng Yang <sheng.yang@citrix.com>
Committed: Tue Dec 10 17:36:12 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/e0268232/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 34450fe..15f1c40 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);


Mime
View raw message