Commit 840791dc authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

865: Simplify installation

Task-Url: https://minfba.de.dariah.eu/mantisbt/view.php?id=865
parent 950188a0
package eu.dariah.de.dariahsp.saml;
package eu.dariah.de.dariahsp.saml.key;
import java.io.IOException;
import java.io.InputStream;
import java.security.KeyStore;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
......@@ -33,7 +35,7 @@ public class KeyManagerWrapper implements KeyManager {
@Override
public Iterable<Credential> resolve(CriteriaSet criteriaSet) throws SecurityException {
return !this.isInitialized() ? null : innerKeyManager.resolve(criteriaSet);
return !this.isInitialized() ? new ArrayList<Credential>() : innerKeyManager.resolve(criteriaSet);
}
@Override
......@@ -58,7 +60,7 @@ public class KeyManagerWrapper implements KeyManager {
@Override
public Set<String> getAvailableCredentials() {
return !this.isInitialized() ? null : innerKeyManager.getAvailableCredentials();
return !this.isInitialized() ? new HashSet<String>() : innerKeyManager.getAvailableCredentials();
}
@Override
......
......@@ -20,7 +20,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<eu.dariah.de.dariahsp.dariahsp-core.version>1.2.1-SNAPSHOT</eu.dariah.de.dariahsp.dariahsp-core.version>
<eu.dariah.de.dariahsp.dariahsp-core.version>1.2.2-SNAPSHOT</eu.dariah.de.dariahsp.dariahsp-core.version>
<eu.dariah.de.dariahsp.dariahsp-sample.version>1.2.0-SNAPSHOT</eu.dariah.de.dariahsp.dariahsp-sample.version>
<de.unibamberg.minf.core.core-metamodel.version>4.2.3-SNAPSHOT</de.unibamberg.minf.core.core-metamodel.version>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment