X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fwot%2FAssurePage.java;h=39a5aa901b83d6a529dec7c733f04fc352b8ce04;hp=aed78f84f55da032b851af98f7aa213f0c9389a6;hb=a0232b6e40e7e09767f0444d24e18bf12dafc362;hpb=1f18f8f4e967518962546c8b9a11aa73eaccf676

diff --git a/src/org/cacert/gigi/pages/wot/AssurePage.java b/src/org/cacert/gigi/pages/wot/AssurePage.java
index aed78f84..39a5aa90 100644
--- a/src/org/cacert/gigi/pages/wot/AssurePage.java
+++ b/src/org/cacert/gigi/pages/wot/AssurePage.java
@@ -10,7 +10,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.database.GigiResultSet;
 import org.cacert.gigi.dbObjects.User;
@@ -40,7 +39,6 @@ public class AssurePage extends Page {
     public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
 
         PrintWriter out = resp.getWriter();
-        String pi = req.getPathInfo().substring(PATH.length());
         HashMap<String, Object> vars = new HashMap<String, Object>();
         vars.put("DoB", ds);
         t.output(out, getLanguage(req), vars);
@@ -76,14 +74,12 @@ public class AssurePage extends Page {
             return;
         }
 
-        GigiResultSet rs = null;
-        try {
-            GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT `users`.`id`, `verified` FROM `users` INNER JOIN `certOwners` ON `certOwners`.`id`=`users`.`id` WHERE `email`=? AND `dob`=? AND `deleted` IS NULL");
+        try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT `users`.`id`, `verified` FROM `users` INNER JOIN `certOwners` ON `certOwners`.`id`=`users`.`id` WHERE `email`=? AND `dob`=? AND `deleted` IS NULL")) {
             ps.setString(1, req.getParameter("email"));
             Calendar c = Calendar.getInstance();
             c.set(Integer.parseInt(req.getParameter("year")), Integer.parseInt(req.getParameter("month")) - 1, Integer.parseInt(req.getParameter("day")));
             ps.setDate(2, new Date(c.getTimeInMillis()));
-            rs = ps.executeQuery();
+            GigiResultSet rs = ps.executeQuery();
             int id = 0;
             if (rs.next()) {
                 id = rs.getInt(1);
@@ -107,11 +103,6 @@ public class AssurePage extends Page {
                 out.print("</div>");
             }
 
-            rs.close();
-        } finally {
-            if (rs != null) {
-                rs.close();
-            }
         }
     }
 }