chg: ensure actor, target and support ticket are non-null

[gigi.git] / src / club / wpia / gigi / pages / PasswordResetPage.java

diff --git a/src/club/wpia/gigi/pages/PasswordResetPage.java b/src/club/wpia/gigi/pages/PasswordResetPage.java
index 92937aeaa1bd6530d15e960488fd6add53a794ca..af1829a09223f504fc3bfcfec424d5d0c9acaced 100644 (file)
--- a/src/club/wpia/gigi/pages/PasswordResetPage.java
+++ b/src/club/wpia/gigi/pages/PasswordResetPage.java
@@ -61,7 +61,7 @@ public class PasswordResetPage extends Page {
 
         @Override
         public SuccessMessageResult submit(HttpServletRequest req) throws GigiApiException {
-            try (GigiPreparedStatement passwordReset = new GigiPreparedStatement("UPDATE `passwordResetTickets` SET `used` = CURRENT_TIMESTAMP WHERE `used` IS NULL AND `created` < CURRENT_TIMESTAMP - interval '1 hours' * ?;")) {
+            try (GigiPreparedStatement passwordReset = new GigiPreparedStatement("UPDATE `passwordResetTickets` SET `used` = CURRENT_TIMESTAMP WHERE `used` IS NULL AND `created` < CURRENT_TIMESTAMP - interval '1 hours' * ?::INTEGER;")) {
                 passwordReset.setInt(1, HOUR_MAX);
                 passwordReset.execute();
             }
@@ -104,7 +104,7 @@ public class PasswordResetPage extends Page {
         try {
             new PasswordResetForm(req).output(resp.getWriter(), getLanguage(req), getDefaultVars(req));
         } catch (GigiApiException e) {
-            e.format(resp.getWriter(), getLanguage(req));
+            e.format(resp.getWriter(), getLanguage(req), getDefaultVars(req));
         }
     }