Closed lift#966. No more inifinite loop closing connections

Fashionbase · Apr 27, 2011 · 0e17bce · 0e17bce
1 parent afb0260
commit 0e17bce
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/persistence/db/src/main/scala/net/liftweb/db/DB.scala b/persistence/db/src/main/scala/net/liftweb/db/DB.scala
@@ -1166,16 +1166,19 @@ trait ProtoDBVendor extends ConnectionManager {
     notifyAll
   }
 
-  def closeAllConnections_!(): Unit = synchronized {
+  def closeAllConnections_!(): Unit = _closeAllConnections_!(0)
+
+
+  private def _closeAllConnections_!(cnt: Int): Unit = synchronized {
     logger.info("Closing all connections")
-    if (poolSize == 0) ()
+    if (poolSize <= 0 || cnt > 10) ()
     else {
       pool.foreach {c => tryo(c.close); poolSize -= 1}
       pool = Nil
 
       if (poolSize > 0) wait(250)
 
-      closeAllConnections_!()
+      _closeAllConnections_!(cnt + 1)
     }
   }
 }