Refactoring

dschadow · dschadow · commit 85e2f5eb9809 · 2013-05-20T17:36:10.000+02:00
Signed-off-by: Dominik Schadow &lt;dominikschadow@googlemail.com&gt;
diff --git a/Ch08_CSRF/src/main/java/de/dominikschadow/webappsecurity/CSRFServlet.java b/Ch08_CSRF/src/main/java/de/dominikschadow/webappsecurity/CSRFServlet.java
@@ -43,35 +43,46 @@ public CSRFServlet() {
     /**
      * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
      */
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException {
         System.out.println("Processing unprotected GET request");
 
         String name = request.getParameter("name");
         System.out.println("Unprotected: Received " + name + " as GET parameter");
 
         response.setContentType("text/html");
 
-        PrintWriter out = response.getWriter();
-        out.println("Received " + name + " as GET parameter");
-        out.flush();
-        out.close();
+        PrintWriter out = null;
+        
+        try {
+            out = response.getWriter();
+            out.println("Received " + name + " as GET parameter");
+        } catch (IOException ex) {
+            ex.printStackTrace();
+        } finally {
+            out.close();
+        }
     }
 
     /**
      * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
      */
-    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException,
-            IOException {
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException {
         System.out.println("Processing unprotected POST request");
 
         String name = request.getParameter("name");
         System.out.println("Unprotected: Received " + name + " as POST parameter");
 
         response.setContentType("text/html");
 
-        PrintWriter out = response.getWriter();
-        out.println("Received " + name + " as GET parameter");
-        out.flush();
-        out.close();
+        PrintWriter out = null;
+        
+        try {
+            out = response.getWriter();
+            out.println("Received " + name + " as GET parameter");
+        } catch (IOException ex) {
+            ex.printStackTrace();
+        } finally {
+            out.close();
+        }
     }
 }
diff --git a/Ch08_CSRF/src/main/java/de/dominikschadow/webappsecurity/ProtectedServlet.java b/Ch08_CSRF/src/main/java/de/dominikschadow/webappsecurity/ProtectedServlet.java
@@ -47,8 +47,7 @@ public ProtectedServlet() {
     /**
      * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
      */
-    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException,
-            IOException {
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException {
         System.out.println("Processing protected POST request");
 
         response.setContentType("text/html");
@@ -58,10 +57,15 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
                 System.out.println("CSRF token is invalid");
                 response.setStatus(401);
 
-                PrintWriter out = response.getWriter();
-                out.println("CSRF token is invalid");
-                out.flush();
-                out.close();
+                PrintWriter out = null;
+                try {
+                    out = response.getWriter();
+                    out.println("CSRF token is invalid");
+                } catch (IOException ex) {
+                    ex.printStackTrace();
+                } finally {
+                    out.close();
+                }
                 
                 return;
             }
@@ -74,9 +78,14 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
         String name = request.getParameter("name");
         System.out.println("Protected: Received " + name + " as POST parameter");
 
-        PrintWriter out = response.getWriter();
-        out.println("Received " + name + " as POST parameter");
-        out.flush();
-        out.close();
+        PrintWriter out = null;
+        try {
+            out = response.getWriter();
+            out.println("Received " + name + " as POST parameter");
+        } catch (IOException ex) {
+            ex.printStackTrace();
+        } finally {
+            out.close();
+        }
     }
 }
