diff options
| author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2014-03-04 23:27:21 +0100 |
|---|---|---|
| committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2014-03-04 23:27:21 +0100 |
| commit | e1a7da578e195a59f4981bc56a9b8c615f1e69d2 (patch) | |
| tree | f77153bf75580e1672a2442020708a872053cc59 /spss/server/serverlib/src/main/java/at/gv/egovernment | |
| parent | 9753d2e1c9fde6778e070825b141e0e69323c9b6 (diff) | |
| parent | f5440a189b89bd4aa69d6d54445579484d5d7228 (diff) | |
| download | moa-id-spss-e1a7da578e195a59f4981bc56a9b8c615f1e69d2.tar.gz moa-id-spss-e1a7da578e195a59f4981bc56a9b8c615f1e69d2.tar.bz2 moa-id-spss-e1a7da578e195a59f4981bc56a9b8c615f1e69d2.zip | |
Merge branch 'moa2_0_tlenz' of https://gitlab.iaik.tugraz.at/afitzek/moa-idspss into moa2_0_tlenz
Conflicts:
id/server/doc/handbook/config/config.html
Diffstat (limited to 'spss/server/serverlib/src/main/java/at/gv/egovernment')
| -rw-r--r-- | spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/timer/TSLUpdaterTimerTask.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/timer/TSLUpdaterTimerTask.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/timer/TSLUpdaterTimerTask.java index 0cb18a08e..5456701c0 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/timer/TSLUpdaterTimerTask.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/timer/TSLUpdaterTimerTask.java @@ -170,7 +170,12 @@ public class TSLUpdaterTimerTask extends TimerTask { fis.close();
}
- // convert ArrayList<File> to X509Certificate[]
+ // convert ArrayList<File> to X509Certificate[]
+ if (tsl_certs == null) {
+ Logger.error("No certificates from TSL imported.");
+ throw new TSLSearchException("No certificates from TSL imported.");
+ }
+
X509Certificate[] addCertificatesTSL = new X509Certificate[tsl_certs.size()];
Iterator itcert = tsl_certs.iterator();
i = 0;
|