Merge changes I7ab53fa7,Id4354942

[gigi.git] / src / club / wpia / gigi / pages / account / certs / CertificateModificationForm.java

diff --git a/src/club/wpia/gigi/pages/account/certs/CertificateModificationForm.java b/src/club/wpia/gigi/pages/account/certs/CertificateModificationForm.java
index 6d6cc8b510491526b0fce20264569bf816a5d593..dd6161132a368a4ec5f2d1d01cbb22fdc4dcf85c 100644 (file)
--- a/src/club/wpia/gigi/pages/account/certs/CertificateModificationForm.java
+++ b/src/club/wpia/gigi/pages/account/certs/CertificateModificationForm.java
@@ -1,6 +1,7 @@
 package club.wpia.gigi.pages.account.certs;
 
 import java.io.PrintWriter;
+import java.math.BigInteger;
 import java.util.LinkedList;
 import java.util.Map;
 
@@ -45,7 +46,7 @@ public class CertificateModificationForm extends Form {
         }
         LinkedList<Job> revokes = new LinkedList<Job>();
         for (String serial : certs) {
-            Certificate c = Certificate.getBySerial(serial);
+            Certificate c = Certificate.getBySerial(new BigInteger(serial, 16));
             if (c == null || c.getOwner() != target) {
                 continue;
             }
@@ -53,7 +54,7 @@ public class CertificateModificationForm extends Form {
         }
         long start = System.currentTimeMillis();
         for (Job job : revokes) {
-            int toWait = (int) (60000 + start - System.currentTimeMillis());
+            int toWait = (int) (Job.WAIT_MIN + start - System.currentTimeMillis());
             if (toWait > 0) {
                 job.waitFor(toWait);
             } else {