Fix: Stacktrace on certificate generation timeout.

diff --git a/src/org/cacert/gigi/dbObjects/Certificate.java b/src/org/cacert/gigi/dbObjects/Certificate.java
index c0fb6285f57b3ac422db274743106916ca4c2baf..6882b8113018c4c41af40bf54f5844f176a9878b 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/Certificate.java
+++ b/src/org/cacert/gigi/dbObjects/Certificate.java
@@ -347,6 +347,9 @@ public class Certificate {
     }
 
     public static Certificate getBySerial(String serial) {
+        if (serial == null || "".equals(serial)) {
+            return null;
+        }
         // TODO caching?
         try {
             return new Certificate(serial);

diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateAdd.java b/src/org/cacert/gigi/pages/account/certs/CertificateAdd.java
index 4e7da1dd187e69b7e866856d74253ee1846e2235..2d9680f18aa619a7b4c567646b9a697ba85e4382 100644 (file)
--- a/src/org/cacert/gigi/pages/account/certs/CertificateAdd.java
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateAdd.java
@@ -30,6 +30,9 @@ public class CertificateAdd extends Page {
         if (f.submit(resp.getWriter(), req)) {
             Certificate c = f.getResult();
             String ser = c.getSerial();
+            if (ser.isEmpty()) {
+                resp.getWriter().println("C");
+            }
             resp.sendRedirect(Certificates.PATH + "/" + ser);
         }
         f.output(resp.getWriter(), getLanguage(req), Collections.<String,Object>emptyMap());