From 64b6f382d35e1fea0172b222277dae0312f274e4 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 25 Feb 2013 09:41:49 -0500
Subject: [PATCH] Merged LDAP user/team pre-fetching and synchronization enhancement from mschaefers

---
 src/com/gitblit/FileUserService.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/com/gitblit/FileUserService.java b/src/com/gitblit/FileUserService.java
index 056df82..32c24cc 100644
--- a/src/com/gitblit/FileUserService.java
+++ b/src/com/gitblit/FileUserService.java
@@ -20,6 +20,7 @@
 import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -270,12 +271,12 @@
 	/**
 	 * Updates/writes all specified user objects.
 	 * 
-	 * @param model a list of user models
+	 * @param models a list of user models
 	 * @return true if update is successful
 	 * @since 1.2.0
 	 */
 	@Override
-	public boolean updateUserModels(List<UserModel> models) {
+	public boolean updateUserModels(Collection<UserModel> models) {
 		try {			
 			Properties allUsers = read();
 			for (UserModel model : models) {
@@ -997,7 +998,7 @@
 	 * @return true if update is successful
 	 * @since 1.2.0
 	 */
-	public boolean updateTeamModels(List<TeamModel> models) {
+	public boolean updateTeamModels(Collection<TeamModel> models) {
 		try {
 			Properties allUsers = read();
 			for (TeamModel model : models) {

--
Gitblit v1.9.1