Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C13DB1030A for ; Wed, 11 Dec 2013 01:36:00 +0000 (UTC) Received: (qmail 56253 invoked by uid 500); 11 Dec 2013 01:36:00 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 56221 invoked by uid 500); 11 Dec 2013 01:36:00 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 56214 invoked by uid 99); 11 Dec 2013 01:36:00 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Dec 2013 01:36:00 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6B9CC812D05; Wed, 11 Dec 2013 01:36:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yasker@apache.org To: commits@cloudstack.apache.org Message-Id: <9755e36c367b451daf8b6adfff21358e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.1 to 1b7c886 Date: Wed, 11 Dec 2013 01:36:00 +0000 (UTC) Updated Branches: refs/heads/4.1 f4abe364a -> 1b7c886bb 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 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1b7c886b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1b7c886b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1b7c886b Branch: refs/heads/4.1 Commit: 1b7c886bb1a4cd28840a13e199fedc8c2e865011 Parents: f4abe36 Author: Sheng Yang Authored: Tue Dec 10 17:32:00 2013 -0800 Committer: Sheng Yang Committed: Tue Dec 10 17:35:54 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/1b7c886b/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 8f6a03c..d74e99a 100755 --- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java +++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java @@ -638,7 +638,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);