[mb-commits] r13613 - in search_server/trunk: index/src/main/java/org/musicbrainz/search/index updater/src/main/java/org/musicbrainz/search/update

Author: murdos
Date: 2013-01-23 21:40:57 +0000 (Wed, 23 Jan 2013)
New Revision: 13613

Modified:
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/IndexBuilder.java
   search_server/trunk/updater/src/main/java/org/musicbrainz/search/update/LiveDataFeedIndexUpdater.java
Log:
SEARCH-263: Search server applications do not gracefully disconnect from PostgreSQL on termination

Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/IndexBuilder.java
===================================================================
--- search_server/trunk/index/src/main/java/org/musicbrainz/search/index/IndexBuilder.java	2013-01-15 04:20:07 UTC (rev 13612)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/IndexBuilder.java	2013-01-23 21:40:57 UTC (rev 13613)
@@ -188,6 +188,7 @@
             }
         }
         es.shutdown();
+        mainDbConn.close();
         System.out.println("Index Builder Finished:"+ Utils.formatCurrentTimeForOutput());
     }
 

Modified: search_server/trunk/updater/src/main/java/org/musicbrainz/search/update/LiveDataFeedIndexUpdater.java
===================================================================
--- search_server/trunk/updater/src/main/java/org/musicbrainz/search/update/LiveDataFeedIndexUpdater.java	2013-01-15 04:20:07 UTC (rev 13612)
+++ search_server/trunk/updater/src/main/java/org/musicbrainz/search/update/LiveDataFeedIndexUpdater.java	2013-01-23 21:40:57 UTC (rev 13613)
@@ -128,10 +128,11 @@
         }
 	}
 	
-	public void destroy() throws CorruptIndexException, IOException {
+	public void destroy() throws CorruptIndexException, IOException, SQLException {
         for(DatabaseIndex index : indexes) {
         	indexWriters.get(index).close();
         }
+        mainDbConn.close();
 	}
 	
 	public void update() throws SQLException, IOException {