From 8a67f06c0276337e9d288264f4e08f493d0ee3f2 Mon Sep 17 00:00:00 2001
From: "moandji.ezana" <mwanji@gmail.com>
Date: Sat, 20 Oct 2012 14:42:57 +0200
Subject: [PATCH] DataSource is closed when application shuts down

---
 .../config/EssayistServletContextListener.java  | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/moandjiezana/tent/essayist/config/EssayistServletContextListener.java b/src/main/java/com/moandjiezana/tent/essayist/config/EssayistServletContextListener.java
index 720dded..a641f6f 100644
--- a/src/main/java/com/moandjiezana/tent/essayist/config/EssayistServletContextListener.java
+++ b/src/main/java/com/moandjiezana/tent/essayist/config/EssayistServletContextListener.java
@@ -23,6 +23,8 @@ import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.Properties;
 
+import javax.servlet.ServletContextEvent;
+
 import org.apache.commons.dbutils.QueryRunner;
 import org.apache.tomcat.jdbc.pool.DataSource;
 import org.apache.tomcat.jdbc.pool.PoolProperties;
@@ -32,6 +34,7 @@ import org.slf4j.LoggerFactory;
 public class EssayistServletContextListener extends GuiceServletContextListener {
   
   private static final Logger LOGGER = LoggerFactory.getLogger(EssayistServletContextListener.class);
+  private DataSource dataSource;
 
   @Override
   protected Injector getInjector() {
@@ -39,8 +42,8 @@ public class EssayistServletContextListener extends GuiceServletContextListener
     Properties defaultProperties = new Properties();
     try {
       defaultProperties.load(getClass().getResourceAsStream("/essayist-defaults.properties"));
-    } catch (IOException e1) {
-      throw Throwables.propagate(e1);
+    } catch (IOException e) {
+      throw Throwables.propagate(e);
     }
     
     Properties properties = new Properties(defaultProperties);
@@ -57,7 +60,7 @@ public class EssayistServletContextListener extends GuiceServletContextListener
     poolProperties.setDriverClassName(properties.getProperty("db.driverClassName"));
     poolProperties.setInitialSize(Integer.parseInt(properties.getProperty("db.initialSize")));
     
-    DataSource dataSource = new DataSource(poolProperties);
+    dataSource = new DataSource(poolProperties);
     
     Connection connection = null;
     try {
@@ -98,5 +101,13 @@ public class EssayistServletContextListener extends GuiceServletContextListener
       }
     });
   }
+  
+  @Override
+  public void contextDestroyed(ServletContextEvent servletContextEvent) {
+    super.contextDestroyed(servletContextEvent);
+    if (dataSource != null) {
+      dataSource.close();
+    }
+  }
 
 }