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 710BC1057A for ; Tue, 6 Jan 2015 15:47:40 +0000 (UTC) Received: (qmail 30436 invoked by uid 500); 6 Jan 2015 15:47:41 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 30406 invoked by uid 500); 6 Jan 2015 15:47:41 -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 30397 invoked by uid 99); 6 Jan 2015 15:47:41 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Jan 2015 15:47:41 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 35AFC9216B0; Tue, 6 Jan 2015 15:47:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dahn@apache.org To: commits@cloudstack.apache.org Message-Id: <94ab0c5da04c4e3e8f20ac6cf601c8d1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 3cba1c4 Date: Tue, 6 Jan 2015 15:47:41 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master 682c3af71 -> 3cba1c41f CID-1114614 dead code removed Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3cba1c41 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3cba1c41 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3cba1c41 Branch: refs/heads/master Commit: 3cba1c41fbcbae6612940714ad9e2e2a7ce4d7bf Parents: 682c3af Author: Daan Hoogland Authored: Tue Jan 6 16:47:32 2015 +0100 Committer: Daan Hoogland Committed: Tue Jan 6 16:47:32 2015 +0100 ---------------------------------------------------------------------- server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java | 3 --- 1 file changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3cba1c41/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java index f9a1586..3c0188d 100644 --- a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java +++ b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java @@ -266,9 +266,6 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc Integer pskLength = _pskLength; if (pskLength != null && (pskLength < 8 || pskLength > 256)) { throw new ConfigurationException("Remote Access VPN: IPSec preshared key length should be between 8 and 256"); - } else if (pskLength == null) { - s_logger.warn("Remote Access VPN configuration missing Preshared Key Length -- ignoring"); - return; } String[] range = ipRange.split("-");