From ac9c2a224a78f413945e25fd7cf23364fbef00b5 Mon Sep 17 00:00:00 2001 From: Rajani Karuturi Date: Fri, 24 Jul 2015 14:52:53 +0530 Subject: [PATCH] fixed finbugs issue due to PR #609 applicationCtx need not be static as the bean is singleton This closes #622 --- .../org/apache/cloudstack/ldap/LdapUserManagerFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 b7414c7c250..f796ce23b4e 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 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();