Serials are in fact Strings.

[gigi.git] / src / org / cacert / gigi / pages / account / MailCertificates.java

diff --git a/src/org/cacert/gigi/pages/account/MailCertificates.java b/src/org/cacert/gigi/pages/account/MailCertificates.java
index e0dd947a06d3dfe37c47683f4c3ec9b8ee3e3b5a..56a0b5bd5cf780573f0fe5f47baa05cd89548273 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MailCertificates.java
+++ b/src/org/cacert/gigi/pages/account/MailCertificates.java
@@ -45,16 +45,10 @@ public class MailCertificates extends Page {
                        cer = true;
                        pi = pi.substring(0, pi.length() - 4);
                }
-               int serial = 0;
+               String serial = pi;
                try {
-                       serial = Integer.parseInt(pi);
-               } catch (NumberFormatException nfe) {
-                       resp.sendError(404);
-                       return true;
-               }
-               try {
-                       Certificate c = new Certificate(serial);
-                       if (LoginPage.getUser(req).getId() != c.getOwnerId()) {
+                       Certificate c = Certificate.getBySerial(serial);
+                       if (c == null || LoginPage.getUser(req).getId() != c.getOwnerId()) {
                                resp.sendError(404);
                                return true;
                        }
@@ -92,15 +86,8 @@ public class MailCertificates extends Page {
                if (pi.length() != 0) {
                        pi = pi.substring(1);
 
-                       int serial = 0;
-                       try {
-                               serial = Integer.parseInt(pi);
-                       } catch (NumberFormatException nfe) {
-                       }
-                       Certificate c = null;
-                       if (serial != 0) {
-                               c = new Certificate(serial);
-                       }
+                       String serial = pi;
+                       Certificate c = Certificate.getBySerial(serial);
                        if (c == null || LoginPage.getUser(req).getId() != c.getOwnerId()) {
                                resp.sendError(404);
                                return;