Merge changes I46ae11f8,I6d71e70e,Ie19e3229

[gigi.git] / src / club / wpia / gigi / output / CertificateIterable.java

diff --git a/src/club/wpia/gigi/output/CertificateIterable.java b/src/club/wpia/gigi/output/CertificateIterable.java
index 6d12a3da2d1e190a4d859c8c60ff098046406a81..cb4b35235d7d0dad931f5a9d74e327f5d515e132 100644 (file)
--- a/src/club/wpia/gigi/output/CertificateIterable.java
+++ b/src/club/wpia/gigi/output/CertificateIterable.java
@@ -6,6 +6,7 @@ import java.security.cert.X509Certificate;
 import java.util.Date;
 import java.util.Map;
 
+import club.wpia.gigi.GigiApiException;
 import club.wpia.gigi.dbObjects.Certificate;
 import club.wpia.gigi.dbObjects.Certificate.CertificateStatus;
 import club.wpia.gigi.localisation.Language;
@@ -35,11 +36,17 @@ public class CertificateIterable implements IterableDataset {
         vars.put("serial", c.getSerial());
         vars.put("digest", c.getMessageDigest());
         vars.put("profile", c.getProfile().getVisibleName());
+        CertificateStatus st = c.getStatus();
+        vars.put("revokable", st != CertificateStatus.REVOKED && st == CertificateStatus.ISSUED);
+        String issuedWarning = "";
+        String expiredWarning = "";
+        vars.put("issued", l.getTranslation("N/A"));
+        vars.put("expire", l.getTranslation("N/A"));
+        vars.put("classIssued", "");
+        vars.put("classExpired", "");
+        vars.put("revoked", l.getTranslation("N/A"));
+
         try {
-            CertificateStatus st = c.getStatus();
-            vars.put("revokable", st != CertificateStatus.REVOKED && st == CertificateStatus.ISSUED);
-            String issuedWarning = "";
-            String expiredWarning = "";
             if (st == CertificateStatus.ISSUED || st == CertificateStatus.REVOKED) {
                 X509Certificate cert = c.cert();
                 vars.put("issued", cert.getNotBefore());
@@ -57,16 +64,13 @@ public class CertificateIterable implements IterableDataset {
                     expiredWarning = "bg-danger";
                 }
                 vars.put("classExpired", expiredWarning);
-            } else {
-                vars.put("issued", l.getTranslation("N/A"));
-                vars.put("expire", l.getTranslation("N/A"));
             }
 
             if (st == CertificateStatus.REVOKED) {
                 vars.put("revoked", c.getRevocationDate());
-            } else {
-                vars.put("revoked", l.getTranslation("N/A"));
             }
+        } catch (GigiApiException e) {
+            e.printStackTrace();
         } catch (IOException e) {
             e.printStackTrace();
         } catch (GeneralSecurityException e) {