Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/LdapConfigAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/LdapConfigAction.java,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/LdapConfigAction.java	28 Sep 2007 08:01:13 -0000	1.1.2.3
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/LdapConfigAction.java	3 Oct 2007 01:08:38 -0000	1.1.2.4
@@ -23,8 +23,6 @@
 /* $Id$ */
 package org.lamsfoundation.lams.admin.web.action;
 
-import java.util.List;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
@@ -37,7 +35,6 @@
 import org.apache.struts.action.ActionMapping;
 import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
 import org.lamsfoundation.lams.usermanagement.AuthenticationMethod;
-import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.BulkUpdateResultDTO;
 import org.lamsfoundation.lams.usermanagement.service.ILdapService;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
@@ -151,16 +148,8 @@
 	}
 	
 	private int getNumLdapUsers() {
-		// get number of ldap users
-		List ldapUsers = getService().findByProperty(
-				User.class, 
-				"authenticationMethod.authenticationMethodId", 
-				AuthenticationMethod.LDAP
-			);
-		if (ldapUsers != null) {
-			return ldapUsers.size();
-		}
-		return -1;
+		Integer count = getService().getCountUsers(AuthenticationMethod.LDAP);
+		return (count != null ? count.intValue() : -1);
 	}
 	
 	private String getNumLdapUsersMsg(int numLdapUsers) {
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java,v
diff -u -r1.44.6.2 -r1.44.6.3
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	21 Sep 2007 02:14:18 -0000	1.44.6.2
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	3 Oct 2007 01:08:39 -0000	1.44.6.3
@@ -33,7 +33,6 @@
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.OrganisationType;
 import org.lamsfoundation.lams.usermanagement.Role;
-import org.lamsfoundation.lams.usermanagement.SupportedLocale;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.UserOrganisation;
 import org.lamsfoundation.lams.usermanagement.dto.OrganisationDTO;
@@ -386,4 +385,8 @@
 	public void auditPasswordChanged(User user, String moduleName);
 	
 	public void auditUserCreated(User user, String moduleName);
+	
+	public Integer getCountUsers();
+	
+	public Integer getCountUsers(Integer authenticationMethodId);
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java,v
diff -u -r1.75.4.2 -r1.75.4.3
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	21 Sep 2007 02:14:18 -0000	1.75.4.2
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	3 Oct 2007 01:08:39 -0000	1.75.4.3
@@ -39,6 +39,7 @@
 import org.lamsfoundation.lams.dao.IBaseDAO;
 import org.lamsfoundation.lams.learningdesign.dao.IGroupDAO;
 import org.lamsfoundation.lams.themes.CSSThemeVisualElement;
+import org.lamsfoundation.lams.usermanagement.AuthenticationMethod;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.OrganisationType;
 import org.lamsfoundation.lams.usermanagement.Role;
@@ -909,5 +910,25 @@
 		String message = messageService.getMessage("audit.user.create", args);
 		getAuditService().log(moduleName, message);
 	}
+	
+	public Integer getCountUsers() {
+		String query = "select count(u) from User u";
+		return getFindIntegerResult(query);
+	}
+	
+	public Integer getCountUsers(Integer authenticationMethodId) {
+		String query = "select count(u) from User u "
+			+ "where u.authenticationMethod.authenticationMethodId="
+			+ authenticationMethodId;
+		return getFindIntegerResult(query);
+	}
+	
+	private Integer getFindIntegerResult(String query) {
+		List list = baseDAO.find(query);
+		if (list != null && list.size() > 0) {
+			return (Integer)list.get(0);
+		}
+		return null;
+	}
 
 }
\ No newline at end of file