diff options
| author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2020-12-09 16:24:21 +0100 |
|---|---|---|
| committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2020-12-09 16:24:21 +0100 |
| commit | 13a046b8df16ed037d2b9bc84969b583e89b8e53 (patch) | |
| tree | 30d25a3a302b3a68edaf6eb9e796dc108d5b23ec /id/server/moa-id-commons/src | |
| parent | ab5efe91d1779893723a7085e1f8984a4b9b466f (diff) | |
| parent | 980a89b39e14b461e660abc9b96fde06c59f10fe (diff) | |
| download | moa-id-spss-13a046b8df16ed037d2b9bc84969b583e89b8e53.tar.gz moa-id-spss-13a046b8df16ed037d2b9bc84969b583e89b8e53.tar.bz2 moa-id-spss-13a046b8df16ed037d2b9bc84969b583e89b8e53.zip | |
Merge branch 'current_development' into 'development_preview'
Current development
See merge request egiz/moa-idspss!1
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.java | 2 |
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 { |