cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From muralire...@apache.org
Subject git commit: updated refs/heads/master to f8b8f60
Date Thu, 28 Mar 2013 10:50:37 GMT
Updated Branches:
  refs/heads/master d437cb6da -> f8b8f6097


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.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f8b8f609
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f8b8f609
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f8b8f609

Branch: refs/heads/master
Commit: f8b8f60977dcb37dcabaa395c4e1a0c7adb114de
Parents: d437cb6
Author: Murali Reddy <murali.reddy@citrix.com>
Authored: Thu Mar 28 16:10:54 2013 +0530
Committer: Murali Reddy <murali.reddy@citrix.com>
Committed: Thu Mar 28 16:20:13 2013 +0530

----------------------------------------------------------------------
 .../gslb/GlobalLoadBalancingRulesServiceImpl.java  |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f8b8f609/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 86c9c50..9cc10aa 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


Mime
View raw message