Convert CSRF-Problems to Exceptions.

[gigi.git] / src / org / cacert / gigi / Gigi.java

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 38a2f0ab35abf5633806205b34a0c22c81990c08..d584cd0956b3e68446fb0eb37b546ea25be1c035 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -18,8 +18,8 @@ import org.cacert.gigi.email.EmailProvider;
 import org.cacert.gigi.output.Menu;
 import org.cacert.gigi.output.MenuItem;
 import org.cacert.gigi.output.Outputable;
-import org.cacert.gigi.output.Template;
-import org.cacert.gigi.output.Form.CSRFError;
+import org.cacert.gigi.output.Form.CSRFException;
+import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.MainPage;
 import org.cacert.gigi.pages.Page;
@@ -113,14 +113,14 @@ public class Gigi extends HttpServlet {
                                                } else {
                                                        p.doGet(req, resp);
                                                }
-                                       } catch (IOException e) {
-                                               e.printStackTrace();
-                                       } catch (CSRFError err) {
+                                       } catch (CSRFException err) {
                                                try {
                                                        resp.sendError(500, "CSRF invalid");
                                                } catch (IOException e) {
                                                        e.printStackTrace();
                                                }
+                                       } catch (IOException e) {
+                                               e.printStackTrace();
                                        }
 
                                }