Merge changes If5eed01f,I88c94e39,If36f5b0a

[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 567f4cb3fa1818c43c8df2c0501a825996cc32ec..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;
 
@@ -8,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import club.wpia.gigi.GigiApiException;
 import club.wpia.gigi.dbObjects.Certificate;
+import club.wpia.gigi.dbObjects.Certificate.RevocationType;
 import club.wpia.gigi.dbObjects.CertificateOwner;
 import club.wpia.gigi.dbObjects.Job;
 import club.wpia.gigi.localisation.Language;
@@ -44,15 +46,15 @@ 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;
             }
-            revokes.add(c.revoke());
+            revokes.add(c.revoke(RevocationType.SUPPORT));
         }
         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 {