Revision: 4254
Author: seba.wagner
Date: Mon Sep 19 07:34:05 2011
Log: Fixes: Ldap Integration Nullpointer Exception because of
Autowired missing Bean
http://code.google.com/p/openmeetings/source/detail?r=4254
Modified:
/tags/1_8/WebContent/WEB-INF/openmeetings-applicationContext.xml
/tags/1_8/src/app/org/openmeetings/app/ldap/LdapLoginManagement.java
/tags/1_8/src/app/org/openmeetings/app/remote/MainService.java
=======================================
--- /tags/1_8/WebContent/WEB-INF/openmeetings-applicationContext.xml Sun
Sep 4 05:21:47 2011
+++ /tags/1_8/WebContent/WEB-INF/openmeetings-applicationContext.xml Mon
Sep 19 07:34:05 2011
@@ -121,6 +121,8 @@
<bean id="generateSWF" class="org.openmeetings.app.documents.GenerateSWF"
/>
<bean id="fileUtils" class="org.openmeetings.app.data.file.FileUtils" />
<bean id="rtpStreamingHandler"
class="org.openmeetings.app.rtp.RTPStreamingHandler" />
+ <bean id="ldapLoginManagement"
class="org.openmeetings.app.ldap.LdapLoginManagement" />
+
<!-- Templates -->
<bean id="registerUserTemplate"
class="org.openmeetings.app.templates.RegisterUserTemplate" />
=======================================
--- /tags/1_8/src/app/org/openmeetings/app/ldap/LdapLoginManagement.java
Tue Aug 30 13:17:16 2011
+++ /tags/1_8/src/app/org/openmeetings/app/ldap/LdapLoginManagement.java
Mon Sep 19 07:34:05 2011
@@ -35,7 +35,6 @@
private static final Logger log = Red5LoggerFactory.getLogger(
LdapLoginManagement.class,
ScopeApplicationAdapter.webAppRootKey);
- private static LdapLoginManagement instance = null;
@Autowired
private Sessionmanagement sessionManagement;
@Autowired
@@ -107,14 +106,6 @@
private LdapLoginManagement() {
// do not use -> singleton
}
-
- /** Getting instance */
- public static synchronized LdapLoginManagement getInstance() {
- if (instance == null) {
- instance = new LdapLoginManagement();
- }
- return instance;
- }
/**
* Determine if is a supported Auth Type
=======================================
--- /tags/1_8/src/app/org/openmeetings/app/remote/MainService.java Wed Sep
7 11:46:30 2011
+++ /tags/1_8/src/app/org/openmeetings/app/remote/MainService.java Mon Sep
19 07:34:05 2011
@@ -93,6 +93,8 @@
private AuthLevelmanagement authLevelManagement;
@Autowired
private LoadAtomRssFeed loadAtomRssFeed;
+ @Autowired
+ private LdapLoginManagement ldapLoginManagement;
// External User Types
public static final String EXTERNAL_USER_TYPE_LDAP = "LDAP";
@@ -341,7 +343,7 @@
ldapLogin = usernameOrEmail + "@" +
ldapConfig.getDomain();
}
- o =
LdapLoginManagement.getInstance().doLdapLogin(ldapLogin,
+ o =
this.ldapLoginManagement.doLdapLogin(ldapLogin,
Userpass, currentClient, SID,
ldapConfig.getConfigFileName());
} else {
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
