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
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e8a144a2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e8a144a2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e8a144a2 Branch: refs/heads/qemu-img Commit: e8a144a21d46467109ae2780fe30cc1e34b0abcf Parents: 66b47ef Author: Murali Reddy <murali.re...@citrix.com> Authored: Thu Mar 28 08:49:35 2013 +0530 Committer: Murali Reddy <murali.re...@citrix.com> Committed: Thu Mar 28 08:49:35 2013 +0530 ---------------------------------------------------------------------- .../gslb/GlobalLoadBalancingRulesServiceImpl.java | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e8a144a2/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java b/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java index 1d4720e..86c9c50 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<NetworkElement> _networkElements; + + protected GslbServiceProvider _gslbProvider = null; + @Override @DB
