HSEARCH-1792 Make sure to tear down the Multi-tenant enabled H2 Conne…

…ctionPool
hibernate · Apr 14, 2015 · afd08e1 · afd08e1
1 parent d307e9b
commit afd08e1
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/orm/src/test/java/org/hibernate/search/test/batchindexing/DatabaseMultitenancyTest.java b/orm/src/test/java/org/hibernate/search/test/batchindexing/DatabaseMultitenancyTest.java
@@ -99,6 +99,7 @@ protected void configure(Configuration cfg) {
 	@Override
 	@Before
 	public void setUp() throws Exception {
+		ClockMultitenantConnectionProvider.start();
 		super.setUp();
 
 		exportSchema( ClockMultitenantConnectionProvider.GEOCHRON_PROVIDER, getCfg() );
@@ -270,6 +271,7 @@ public void deleteEntities() throws Exception {
 		session = openSessionWithTenantId( GEOCHRON_TID );
 		deleteClocks( session );
 		session.close();
+		ClockMultitenantConnectionProvider.stop();
 	}
 
 	private void deleteClocks(Session session) {
@@ -315,8 +317,8 @@ public void release() throws SQLException {
 
 	public static class ClockMultitenantConnectionProvider extends AbstractMultiTenantConnectionProvider {
 
-		private static final ConnectionProvider METAMEC_PROVIDER = buildConnectionProvider( METAMEC_TID );
-		private static final ConnectionProvider GEOCHRON_PROVIDER = buildConnectionProvider( GEOCHRON_TID );
+		private static DriverManagerConnectionProviderImpl METAMEC_PROVIDER;
+		private static DriverManagerConnectionProviderImpl GEOCHRON_PROVIDER;
 
 		@Override
 		protected ConnectionProvider getAnyConnectionProvider() {
@@ -348,6 +350,19 @@ public static Properties getConnectionProviderProperties(String dbName) {
 			props.put( Environment.PASS, "" );
 			return props;
 		}
+
+		static void stop() {
+			METAMEC_PROVIDER.stop();
+			GEOCHRON_PROVIDER.stop();
+			//Cleanup hacky static variables
+			METAMEC_PROVIDER = null;
+			GEOCHRON_PROVIDER = null;
+		}
+
+		static void start() {
+			METAMEC_PROVIDER = buildConnectionProvider( METAMEC_TID );
+			GEOCHRON_PROVIDER = buildConnectionProvider( GEOCHRON_TID );
+		}
 	}
 
 }