upd: enforce a more strict Form call pattern.

[gigi.git] / src / org / cacert / gigi / pages / admin / support / FindCertPage.java

diff --git a/src/org/cacert/gigi/pages/admin/support/FindCertPage.java b/src/org/cacert/gigi/pages/admin/support/FindCertPage.java
index 2e1f913471797551e9e9b3ffe4968683385b0fd2..e7f6b95e4a4a9558a45f0328f51a7de4394973c6 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/FindCertPage.java
+++ b/src/org/cacert/gigi/pages/admin/support/FindCertPage.java
@@ -33,11 +33,15 @@ public class FindCertPage extends Page {
         new FindCertForm(req).output(resp.getWriter(), Page.getLanguage(req), new HashMap<String, Object>());
     }
 
         new FindCertForm(req).output(resp.getWriter(), Page.getLanguage(req), new HashMap<String, Object>());
     }
 

+    @Override
+    public boolean beforePost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        return Form.getForm(req, FindCertForm.class).submitExceptionProtected(req, resp);
+    }
+

     @Override
     public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
     @Override
     public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {

-        FindCertForm form = Form.getForm(req, FindCertForm.class);
-        if (form.submitProtected(resp.getWriter(), req)) {
-            final Certificate[] certs = form.getCerts();
+        if ( !Form.printFormErrors(req, resp.getWriter())) {
+            final Certificate[] certs = ((FindCertForm.FindResult) req.getAttribute(Form.SUBMIT_RESULT)).getCerts();

             if (certs.length == 1) {
                 resp.sendRedirect(Certificates.SUPPORT_PATH + "/" + certs[0].getSerial());
             } else {
             if (certs.length == 1) {
                 resp.sendRedirect(Certificates.SUPPORT_PATH + "/" + certs[0].getSerial());
             } else {