From e8a144a21d46467109ae2780fe30cc1e34b0abcf Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Thu, 28 Mar 2013 08:49:35 +0530 Subject: [PATCH] BLOCKER: oss jetty server fails to launch temporarily disabling spring injection of GslbServiceProvider as only implementing class is in non-oss, so oss build fails to launch with no bean fpund exception --- .../region/gslb/GlobalLoadBalancingRulesServiceImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java b/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java index 1d4720e9108..86c9c505ab4 100644 --- a/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java +++ b/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java @@ -28,7 +28,6 @@ import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.Network; import com.cloud.network.dao.*; -import com.cloud.network.element.NetworkElement; import com.cloud.network.rules.LoadBalancer; import com.cloud.network.rules.RulesManager; import com.cloud.region.ha.GlobalLoadBalancerRule; @@ -80,10 +79,9 @@ public class GlobalLoadBalancingRulesServiceImpl implements GlobalLoadBalancingR IPAddressDao _ipAddressDao; @Inject AgentManager _agentMgr; - @Inject - protected GslbServiceProvider _gslbProvider; - @Inject - protected List _networkElements; + + protected GslbServiceProvider _gslbProvider = null; + @Override @DB