Revision: 3151
Author: [email protected]
Date: Wed Mar 17 02:38:17 2010
Log: Bugfix empty organization
http://code.google.com/p/openmeetings/source/detail?r=3151
Modified:
/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/LdapLoginManagement.java
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/LdapLoginManagement.java
Mon Mar 8 12:19:31 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/LdapLoginManagement.java
Wed Mar 17 02:38:17 2010
@@ -212,6 +212,7 @@
if(ldap_auth_type == null)
ldap_auth_type = "";
+
if ( ! isValidAuthType(ldap_auth_type) ){
log.error("ConfigKey in Ldap Config contains invalid auth type : '" +
ldap_auth_type + "' -> Defaulting to " +
LdapAuthBase.LDAP_AUTH_TYPE_SIMPLE);
ldap_auth_type = LdapAuthBase.LDAP_AUTH_TYPE_SIMPLE;
@@ -231,6 +232,7 @@
log.debug("authenticating admin...");
lAuth.authenticateUser(ldap_admin_dn, ldap_passwd);
+
log.debug("Checking server type...");
//for OpenLDAP only
if (ldap_server_type.equalsIgnoreCase("OpenLDAP")) {
@@ -330,6 +332,9 @@
// Return UserObject
Users u2 =
Usermanagement.getInstance().getUserById(userid);
+ //initialize lazy collection
+
Usermanagement.getInstance().refreshUserObject(u2);
+
if(u2 == null)
return userid;
--
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.
