use ensure to make sure connection is added back, fix MatchError

twitter-archive · Nov 11, 2011 · 1bdff2d · 1bdff2d
1 parent 7e1cb6d
commit 1bdff2d
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/querulous-core/src/main/scala/com/twitter/querulous/async/BlockingDatabaseWrapper.scala b/querulous-core/src/main/scala/com/twitter/querulous/async/BlockingDatabaseWrapper.scala
@@ -46,11 +46,9 @@ extends AsyncDatabase {
   def withConnection[R](f: Connection => R) = {
     checkoutConnection() flatMap { conn =>
       workPool {
-        try {
-          f(conn)
-        } finally {
-          database.close(conn)
-        }
+        f(conn)
+      } ensure {
+        database.close(conn)
       }
     }
   }
@@ -66,8 +64,10 @@ extends AsyncDatabase {
     }
 
     // cancel future if it times out
-    result.within(checkoutTimer, openTimeout) onFailure {
-      case _: java.util.concurrent.TimeoutException => result.cancel()
+    result.within(checkoutTimer, openTimeout) onFailure { e =>
+      if (e.isInstanceOf[java.util.concurrent.TimeoutException]) {
+        result.cancel()
+      }
     }
   }