Try-with-resources

Arun Gupta · Arun Gupta · commit 747c1347addd · 2013-03-25T14:07:43.000Z
Former-commit-id: 4e153cc5a37bdee425187e0c1f34f1ffaf8fd165
diff --git a/samples/servlet/protocol-handler/src/main/java/org/sample/protocolhandler/UpgradeServlet.java b/samples/servlet/protocol-handler/src/main/java/org/sample/protocolhandler/UpgradeServlet.java
@@ -66,9 +66,7 @@ public class UpgradeServlet extends HttpServlet {
     protected void processRequest(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         response.setContentType("text/html;charset=UTF-8");
-        PrintWriter out = response.getWriter();
-        try {
-            /* TODO output your page here. You may use following sample code. */
+        try (PrintWriter out = response.getWriter()) {
             out.println("<html>");
             out.println("<head>");
             out.println("<title>Servlet UpgradeServlet</title>");            
@@ -84,8 +82,6 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
             }
             out.println("</body>");
             out.println("</html>");
-        } finally {            
-            out.close();
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -66,9 +66,7 @@ public class UpgradeServlet extends HttpServlet {`
`66`	`66`	`protected void processRequest(HttpServletRequest request, HttpServletResponse response)`
`67`	`67`	`throws ServletException, IOException {`
`68`	`68`	`response.setContentType("text/html;charset=UTF-8");`
`69`		`- PrintWriter out = response.getWriter();`
`70`		`- try {`
`71`		`- /* TODO output your page here. You may use following sample code. */`
	`69`	`+ try (PrintWriter out = response.getWriter()) {`
`72`	`70`	`out.println("<html>");`
`73`	`71`	`out.println("<head>");`
`74`	`72`	`out.println("<title>Servlet UpgradeServlet</title>");`
`@@ -84,8 +82,6 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re`
`84`	`82`	`}`
`85`	`83`	`out.println("</body>");`
`86`	`84`	`out.println("</html>");`
`87`		`- } finally {`
`88`		`- out.close();`
`89`	`85`	`}`
`90`	`86`	`}`
`91`	`87`