Author: shalin
Date: Fri Apr 3 09:12:00 2009
New Revision: 761578
URL: http://svn.apache.org/viewvc?rev=761578&view=rev
Log:
SOLR-1068 followup -- Shutdown the executor in a finally block if it is alive
Modified:
lucene/solr/trunk/src/java/org/apache/solr/handler/SnapPuller.java
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/SnapPuller.java
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/SnapPuller.java?rev=761578&r1=761577&r2=761578&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/SnapPuller.java
(original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/SnapPuller.java Fri Apr
3 09:12:00 2009
@@ -305,6 +305,7 @@
filesToDownload = filesDownloaded = confFilesDownloaded =
confFilesToDownload = null;
replicationStartTime = 0;
fileFetcher = null;
+ if (fsyncService != null && !fsyncService.isShutdown())
fsyncService.shutdownNow();
fsyncService = null;
stop = false;
fsyncException = null;