[lh 436] fixing potential connection leak when retrieving db URL

playframework · Jun 1, 2012 · b083ffd · b083ffd
1 parent 37ce26d
commit b083ffd
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/framework/src/play/src/main/scala/play/api/db/DB.scala b/framework/src/play/src/main/scala/play/api/db/DB.scala
@@ -44,8 +44,10 @@ trait DBApi {
    * @throws an error if the required data source is not registered
    */
   def getDataSourceURL(name: String): String = {
-    val ds = getDataSource(name)
-    ds.getConnection.getMetaData.getURL
+    val connection = getDataSource(name).getConnection
+    val url = connection.getMetaData.getURL
+    connection.close()
+    url
   }
 
   /**
@@ -199,6 +201,12 @@ class BoneCPPlugin(app: Application) extends DBPlugin {
 
   lazy val dbConfig = app.configuration.getConfig("db").getOrElse(Configuration.empty)
 
+  private def dbURL(conn: Connection): String = {
+    val u = conn.getMetaData.getURL
+    conn.close()
+    u
+  }
+
   // should be accessed in onStart first
   private lazy val dbApi: DBApi = new BoneCPApi(dbConfig, app.classloader)
 
@@ -223,6 +231,7 @@ class BoneCPPlugin(app: Application) extends DBPlugin {
    */
   def api: DBApi = dbApi
 
+
   /**
    * Reads the configuration and connects to every data source.
    */
@@ -233,7 +242,7 @@ class BoneCPPlugin(app: Application) extends DBPlugin {
         ds._1.getConnection.close()
         app.mode match {
           case Mode.Test =>
-          case mode => Logger("play").info("database [" + ds._2 + "] connected at " + ds._1.getConnection.getMetaData.getURL)
+          case mode => Logger("play").info("database [" + ds._2 + "] connected at " + dbURL(ds._1.getConnection))
         }
       } catch {
         case e => {