Simplified connection closing so it's concise for the tutorial.

jkutner · jkutner · commit 0bade558646a · 2015-01-13T08:41:45.000-06:00
diff --git a/src/main/java/Main.java b/src/main/java/Main.java
@@ -27,11 +27,10 @@ private void showHome(HttpServletRequest req, HttpServletResponse resp)
   private void showDatabase(HttpServletRequest req, HttpServletResponse resp)
       throws ServletException, IOException {
     Connection connection = null;
-    Statement stmt = null;
     try {
       connection = getConnection();
 
-      stmt = connection.createStatement();
+      Statement stmt = connection.createStatement();
       stmt.executeUpdate("CREATE TABLE IF NOT EXISTS ticks (tick timestamp)");
       stmt.executeUpdate("INSERT INTO ticks VALUES (now())");
       ResultSet rs = stmt.executeQuery("SELECT tick FROM ticks");
@@ -45,36 +44,10 @@ private void showDatabase(HttpServletRequest req, HttpServletResponse resp)
     } catch (Exception e) {
       resp.getWriter().print("There was an error: " + e.getMessage());
     } finally {
-      ensureConnectionClosed(connection, stmt, null);
+      if (connection != null) try{connection.close();} catch(SQLException e){}
     }
   }
 
-  public void ensureConnectionClosed(Connection conn, Statement ps, ResultSet rs) {
-      if (rs != null) {
-          try {
-              rs.close();
-          }
-          catch (SQLException e) {
-          }
-      }
-
-      if (ps != null) {
-          try {
-              ps.close();
-          }
-          catch (SQLException e) {
-          }
-      }
-
-      if (conn != null) {
-          try {
-              conn.close();
-          }
-          catch (SQLException e) {
-          }
-      }
-  }
-
   private Connection getConnection() throws URISyntaxException, SQLException {
     URI dbUri = new URI(System.getenv("DATABASE_URL"));
 
@@ -87,7 +60,7 @@ private Connection getConnection() throws URISyntaxException, SQLException {
     return DriverManager.getConnection(dbUrl, username, password);
   }
 
-  public static void main(String[] args) throws Exception{
+  public static void main(String[] args) throws Exception {
     Server server = new Server(Integer.valueOf(System.getenv("PORT")));
     ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
     context.setContextPath("/");
