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 AF89E17984 for ; Fri, 3 Oct 2014 11:11:48 +0000 (UTC) Received: (qmail 26368 invoked by uid 500); 3 Oct 2014 11:11:40 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 26318 invoked by uid 500); 3 Oct 2014 11:11:40 -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 26279 invoked by uid 99); 3 Oct 2014 11:11:40 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Oct 2014 11:11:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 52F33A1F016; Fri, 3 Oct 2014 11:11:40 +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 Date: Fri, 03 Oct 2014 11:12:06 -0000 Message-Id: <52ce73cfcc79413ba093309a6438613c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [28/50] [abbrv] git commit: updated refs/heads/vpc-refactor to a8cb7c1 Fixing NPE due to use of dependencies before Spring injection Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/34f2863e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/34f2863e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/34f2863e Branch: refs/heads/vpc-refactor Commit: 34f2863e630e7beb359e085edaea2949cf094532 Parents: 0d17f3b Author: Antonio Fornie Authored: Fri Aug 22 06:44:10 2014 -0500 Committer: Wilder Rodrigues Committed: Fri Oct 3 06:21:28 2014 +0200 ---------------------------------------------------------------------- .../src/com/cloud/network/router/VpcNetworkHelperImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/34f2863e/server/src/com/cloud/network/router/VpcNetworkHelperImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/router/VpcNetworkHelperImpl.java b/server/src/com/cloud/network/router/VpcNetworkHelperImpl.java index bbd08fd..aa57a54 100644 --- a/server/src/com/cloud/network/router/VpcNetworkHelperImpl.java +++ b/server/src/com/cloud/network/router/VpcNetworkHelperImpl.java @@ -23,6 +23,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.TreeSet; +import javax.annotation.PostConstruct; import javax.inject.Inject; import org.apache.commons.lang.StringUtils; @@ -56,7 +57,13 @@ public class VpcNetworkHelperImpl extends NetworkHelperImpl { @Inject protected NicProfileHelper nicProfileHelper; - protected final String noHypervisorsErrMsgDetails = StringUtils.join(this.vpcMgr.getSupportedVpcHypervisors(), ','); + protected String noHypervisorsErrMsgDetails; + + @PostConstruct + protected void setupNoHypervisorsErrMsgDetails() { + this.noHypervisorsErrMsgDetails = StringUtils.join(this.vpcMgr.getSupportedVpcHypervisors(), ','); + this.noHypervisorsErrMsgDetails += " are the only supported Hypervisors"; + } @Override protected String getNoHypervisorsErrMsgDetails() {