From: Felix Dörre Date: Wed, 27 Aug 2014 10:35:41 +0000 (+0200) Subject: Thanks Find bugs for that small error. X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=06b41fa06bd488f943eae0a16a71babdd2745e24 Thanks Find bugs for that small error. --- diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index 7a9aaffd..eab09850 100644 --- a/src/org/cacert/gigi/Gigi.java +++ b/src/org/cacert/gigi/Gigi.java @@ -67,7 +67,7 @@ public class Gigi extends HttpServlet { public Gigi(Properties conf) { if (instance != null) { - new IllegalStateException("Multiple Gigi instances!"); + throw new IllegalStateException("Multiple Gigi instances!"); } instance = this; DatabaseConnection.init(conf); diff --git a/src/org/cacert/gigi/output/CertificateValiditySelector.java b/src/org/cacert/gigi/output/CertificateValiditySelector.java index a58ca873..37e5afd2 100644 --- a/src/org/cacert/gigi/output/CertificateValiditySelector.java +++ b/src/org/cacert/gigi/output/CertificateValiditySelector.java @@ -17,7 +17,7 @@ public class CertificateValiditySelector implements Outputable { private static ThreadLocal fmt = new ThreadLocal<>(); - private static final int DAY = 1000 * 60 * 60 * 24; + private static final long DAY = 1000 * 60 * 60 * 24; private Date from; diff --git a/src/org/cacert/gigi/ping/PingerDaemon.java b/src/org/cacert/gigi/ping/PingerDaemon.java index 253780cb..ac61f14c 100644 --- a/src/org/cacert/gigi/ping/PingerDaemon.java +++ b/src/org/cacert/gigi/ping/PingerDaemon.java @@ -62,7 +62,7 @@ public class PingerDaemon extends Thread { } enterPingResult.setInt(1, rs.getInt("id")); String resp = dp.ping(Domain.getById(rs.getInt("domainid")), config, User.getById(rs.getInt("memid"))); - enterPingResult.setString(2, resp == DomainPinger.PING_STILL_PENDING ? "open" : resp == DomainPinger.PING_SUCCEDED ? "success" : "failed"); + enterPingResult.setString(2, DomainPinger.PING_STILL_PENDING == resp ? "open" : DomainPinger.PING_SUCCEDED.equals(resp) ? "success" : "failed"); enterPingResult.setString(3, resp); enterPingResult.setString(4, token); enterPingResult.execute();