SEC-1652: Only use URI for ldif path if file isn't found.
This commit is contained in:
parent
3fe49dfae5
commit
bd7389b6ff
|
@ -1,6 +1,7 @@
|
|||
package org.springframework.security.ldap.server;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.net.URI;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
@ -232,7 +233,13 @@ public class ApacheDSContainer implements InitializingBean, DisposableBean, Life
|
|||
//DirContext dirContext = contextSource.getReadWriteContext();
|
||||
|
||||
if(ldifs != null && ldifs.length > 0) {
|
||||
String ldifFile = ldifs[0].getURI().toString();
|
||||
String ldifFile;
|
||||
|
||||
try {
|
||||
ldifFile = ldifs[0].getFile().getAbsolutePath();
|
||||
} catch (IOException e) {
|
||||
ldifFile = ldifs[0].getURI().toString();
|
||||
}
|
||||
logger.info("Loading LDIF file: " + ldifFile);
|
||||
LdifFileLoader loader = new LdifFileLoader(service.getAdminSession(), ldifFile);
|
||||
loader.execute();
|
||||
|
|
Loading…
Reference in New Issue