aboutsummaryrefslogtreecommitdiff
path: root/spss/server/serverlib/src/main/java
diff options
context:
space:
mode:
authorKlaus Stranacher <kstranacher@iaik.tugraz.at>2014-03-04 15:52:58 +0100
committerKlaus Stranacher <kstranacher@iaik.tugraz.at>2014-03-04 15:52:58 +0100
commit959bc875d6038fc6983006a92a9cecc5c30ecfb6 (patch)
treee64d7735b7c3c93152c9541dd100438f8e932f58 /spss/server/serverlib/src/main/java
parent228863d37f1c998a76d5b04825e3b68188a9af0b (diff)
downloadmoa-id-spss-959bc875d6038fc6983006a92a9cecc5c30ecfb6.tar.gz
moa-id-spss-959bc875d6038fc6983006a92a9cecc5c30ecfb6.tar.bz2
moa-id-spss-959bc875d6038fc6983006a92a9cecc5c30ecfb6.zip
Updates for MOA-SPSS v1.5.2
Check if certificate import is not empty from TSL
Diffstat (limited to 'spss/server/serverlib/src/main/java')
-rw-r--r--spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/timer/TSLUpdaterTimerTask.java7
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;