cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [28/50] [abbrv] git commit: updated refs/heads/vpc-refactor to a8cb7c1
Date Fri, 03 Oct 2014 11:12:06 GMT
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 <afornie@schubergphilis.com>
Authored: Fri Aug 22 06:44:10 2014 -0500
Committer: Wilder Rodrigues <wrodrigues@schubergphilis.com>
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() {


Mime
View raw message