From f8b8f60977dcb37dcabaa395c4e1a0c7adb114de Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Thu, 28 Mar 2013 16:10:54 +0530 Subject: [PATCH] Inject GslbServiceProvider using @Inject fails in oss build, as it requires an implemenation by default to autowire but only implementation avaialable is in nonoss plugin. So using autowired required=false for injecting GslbServiceProvider that will work with both oss and non-oss builds. --- .../region/gslb/GlobalLoadBalancingRulesServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java b/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java index 86c9c505ab4..9cc10aa044e 100644 --- a/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java +++ b/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java @@ -44,6 +44,7 @@ import org.apache.cloudstack.api.command.user.region.ha.gslb.*; import org.apache.cloudstack.region.Region; import org.apache.cloudstack.region.dao.RegionDao; import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import javax.ejb.Local; @@ -79,8 +80,8 @@ public class GlobalLoadBalancingRulesServiceImpl implements GlobalLoadBalancingR IPAddressDao _ipAddressDao; @Inject AgentManager _agentMgr; - - protected GslbServiceProvider _gslbProvider = null; + @Autowired(required=false) + protected GslbServiceProvider _gslbProvider; @Override