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 576D7FE73 for ; Sat, 30 Mar 2013 09:58:39 +0000 (UTC) Received: (qmail 63531 invoked by uid 500); 30 Mar 2013 09:58:35 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 62596 invoked by uid 500); 30 Mar 2013 09:58:33 -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 62463 invoked by uid 99); 30 Mar 2013 09:58:31 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Mar 2013 09:58:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 10EEF83455F; Sat, 30 Mar 2013 09:58:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: widodh@apache.org To: commits@cloudstack.apache.org Date: Sat, 30 Mar 2013 09:58:38 -0000 Message-Id: <66e90277c135493082843c84d44a7c5f@git.apache.org> In-Reply-To: <4247a17f41bc48deb8f48309d3d6aadf@git.apache.org> References: <4247a17f41bc48deb8f48309d3d6aadf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/52] [abbrv] git commit: updated refs/heads/qemu-img to 44197a0 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 Authored: Thu Mar 28 08:49:35 2013 +0530 Committer: Murali Reddy 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 _networkElements; + + protected GslbServiceProvider _gslbProvider = null; + @Override @DB