aboutsummaryrefslogtreecommitdiff
path: root/id/server/moa-id-commons/src
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2020-12-10 14:31:55 +0100
committerThomas Lenz <thomas.lenz@egiz.gv.at>2020-12-10 14:31:55 +0100
commit9128d32d0bbbdc4d7183d3e189ffd3f59905aad5 (patch)
tree30d25a3a302b3a68edaf6eb9e796dc108d5b23ec /id/server/moa-id-commons/src
parentab5efe91d1779893723a7085e1f8984a4b9b466f (diff)
parent13a046b8df16ed037d2b9bc84969b583e89b8e53 (diff)
downloadmoa-id-spss-9128d32d0bbbdc4d7183d3e189ffd3f59905aad5.tar.gz
moa-id-spss-9128d32d0bbbdc4d7183d3e189ffd3f59905aad5.tar.bz2
moa-id-spss-9128d32d0bbbdc4d7183d3e189ffd3f59905aad5.zip
Merge branch 'development_preview' into 'master'
Development preview See merge request egiz/moa-idspss!2
Diffstat (limited to 'id/server/moa-id-commons/src')
-rw-r--r--id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java b/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java
index 6d341b88b..1c7b1d202 100644
--- a/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java
+++ b/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java
@@ -50,7 +50,7 @@ public class KeyStoreUtilsTest extends TestCase {
}
protected void setUp() throws Exception {
- Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());
+ //Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());
new File(tmpDir).mkdirs();
}
protected void tearDown() throws Exception {