diff options
author | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-07-14 15:28:27 +0200 |
---|---|---|
committer | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-07-14 15:28:27 +0200 |
commit | ba924b55cf1aa028b384ce5feaeef3defa4572b8 (patch) | |
tree | 7f1f974e5fb67c50fb70c5e95736cf2601748f8f /id/ConfigWebTool/src/main | |
parent | a2b550988cf86a41be95ff9ad50e62d2adf7ce1c (diff) | |
parent | 6fbab2eede4c6cf54d2b6f34fcccc246d5183667 (diff) | |
download | moa-id-spss-ba924b55cf1aa028b384ce5feaeef3defa4572b8.tar.gz moa-id-spss-ba924b55cf1aa028b384ce5feaeef3defa4572b8.tar.bz2 moa-id-spss-ba924b55cf1aa028b384ce5feaeef3defa4572b8.zip |
Merge branch 'merge' into moa-2.1-Snapshot
Diffstat (limited to 'id/ConfigWebTool/src/main')
-rw-r--r-- | id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java index 681641834..f29780f05 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java @@ -159,7 +159,8 @@ public class GeneralMOAIDConfig { if (authgen != null) { alternativeSourceID = authgen.getAlternativeSourceID(); certStoreDirectory = authgen.getCertStoreDirectory(); - trustmanagerrevocationcheck = authgen.isTrustManagerRevocationChecking(); + if (authgen.isTrustManagerRevocationChecking() != null) + trustmanagerrevocationcheck = authgen.isTrustManagerRevocationChecking(); publicURLPrefix = authgen.getPublicURLPreFix(); |