mirror of
https://github.com/DSpace/DSpace.git
synced 2025-10-09 02:54:20 +00:00
[DS-3782] Upgrade Commons Collections to version 4
This commit is contained in:

committed by
Tom Desair

parent
eb2b4184ef
commit
8ffbec58ca
@@ -10,6 +10,7 @@ package org.dspace.authenticate;
|
||||
import java.io.IOException;
|
||||
import java.sql.SQLException;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.Hashtable;
|
||||
import java.util.List;
|
||||
import javax.naming.NamingEnumeration;
|
||||
@@ -27,7 +28,6 @@ import javax.naming.ldap.StartTlsResponse;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.apache.commons.collections.ListUtils;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.log4j.Logger;
|
||||
import org.dspace.authenticate.factory.AuthenticateServiceFactory;
|
||||
@@ -136,7 +136,7 @@ public class LDAPAuthentication
|
||||
log.warn(LogManager.getHeader(context,
|
||||
"ldap_specialgroup",
|
||||
"Group defined in login.specialgroup does not exist"));
|
||||
return ListUtils.EMPTY_LIST;
|
||||
return Collections.EMPTY_LIST;
|
||||
} else {
|
||||
return Arrays.asList(ldapGroup);
|
||||
}
|
||||
@@ -145,7 +145,7 @@ public class LDAPAuthentication
|
||||
} catch (Exception npe) {
|
||||
// The user is not an LDAP user, so we don't need to worry about them
|
||||
}
|
||||
return ListUtils.EMPTY_LIST;
|
||||
return Collections.EMPTY_LIST;
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user