fixed finbugs issue due to PR #609 applicationCtx need not be static as the bean is singleton
This closes #622 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ac9c2a22 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ac9c2a22 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ac9c2a22 Branch: refs/heads/reporter Commit: ac9c2a224a78f413945e25fd7cf23364fbef00b5 Parents: 090db05 Author: Rajani Karuturi <rajanikarut...@gmail.com> Authored: Fri Jul 24 14:52:53 2015 +0530 Committer: Rajani Karuturi <rajanikarut...@gmail.com> Committed: Fri Jul 24 17:42:21 2015 +0530 ---------------------------------------------------------------------- .../src/org/apache/cloudstack/ldap/LdapUserManagerFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ac9c2a22/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManagerFactory.java ---------------------------------------------------------------------- diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManagerFactory.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManagerFactory.java index b7414c7..f796ce2 100644 --- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManagerFactory.java +++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManagerFactory.java @@ -34,7 +34,7 @@ public class LdapUserManagerFactory implements ApplicationContextAware { private static Map<LdapUserManager.Provider, LdapUserManager> ldapUserManagerMap = new HashMap<>(); - static ApplicationContext applicationCtx; + private ApplicationContext applicationCtx; public LdapUserManager getInstance(LdapUserManager.Provider provider) { LdapUserManager ldapUserManager; @@ -46,7 +46,7 @@ public class LdapUserManagerFactory implements ApplicationContextAware { ldapUserManagerMap.put(LdapUserManager.Provider.MICROSOFTAD, ldapUserManager); } } else { - //defaults to opendldap + //defaults to openldap ldapUserManager = ldapUserManagerMap.get(LdapUserManager.Provider.OPENLDAP); if (ldapUserManager == null) { ldapUserManager = new OpenLdapUserManagerImpl();
