You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by an...@apache.org on 2014/06/07 02:55:13 UTC
svn commit: r1601048 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/core/
solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
Author: anshum
Date: Sat Jun 7 00:55:12 2014
New Revision: 1601048
URL: http://svn.apache.org/r1601048
Log:
SOLR-6148: Trying to fix Jenkins failures by not LazyLoading the ParallelExecutor in CoreAdminHandler (Merge from trunk r1601047)
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java?rev=1601048&r1=1601047&r2=1601048&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java Sat Jun 7 00:55:12 2014
@@ -98,7 +98,8 @@ public class CoreAdminHandler extends Re
protected static HashMap<String, Map<String, TaskObject>> requestStatusMap =
new HashMap<String,Map<String, TaskObject>>();
- protected ExecutorService parallelExecutor = null;
+ protected final ExecutorService parallelExecutor = Executors.newFixedThreadPool(50,
+ new DefaultSolrThreadFactory("parallelCoreAdminExecutor"));
protected static int MAX_TRACKED_REQUESTS = 100;
public static String RUNNING = "running";
@@ -119,8 +120,6 @@ public class CoreAdminHandler extends Re
// Unlike most request handlers, CoreContainer initialization
// should happen in the constructor...
this.coreContainer = null;
- this.parallelExecutor = Executors.newFixedThreadPool(50,
- new DefaultSolrThreadFactory("parallelCoreAdminExecutor"));
}
@@ -131,8 +130,6 @@ public class CoreAdminHandler extends Re
*/
public CoreAdminHandler(final CoreContainer coreContainer) {
this.coreContainer = coreContainer;
- this.parallelExecutor = Executors.newFixedThreadPool(50,
- new DefaultSolrThreadFactory("parallelCoreAdminExecutor"));
}