cleanup the close derby database method a bit. it seems to work.

JumpMind · Aug 9, 2008 · 879bd6a · 879bd6a
1 parent 274c7a5
commit 879bd6a
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/test/TestSetupUtil.java b/symmetric/src/test/java/org/jumpmind/symmetric/test/TestSetupUtil.java
@@ -101,6 +101,15 @@ public static void cleanup() throws Exception {
             rootServer = null;
         }
 
+        closeDerbyAndReloadDriver();
+    }
+
+    /**
+     * Unit tests were failing after opening and closing several data connection pools against the 
+     * same database in memory.  After shutting down the connection pool, it seems to help by shutting
+     * down the entire database.
+     */
+    protected static void closeDerbyAndReloadDriver() throws SQLException {
         try {
             DriverManager.getConnection("jdbc:derby:;shutdown=true");            
         } catch (SQLException ex) {
@@ -111,7 +120,6 @@ public static void cleanup() throws Exception {
         } catch (Exception ex) {
             // derby not in use ...
         }
-
     }
 
     public static void setup(String testPrefix, String sqlScriptSuffix, String clientDb, String rootDb)