svn commit: r1601047 - /lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java

[an...@apache.org]

Author: anshum
Date: Sat Jun  7 00:53:56 2014
New Revision: 1601047

URL: http://svn.apache.org/r1601047
Log:
SOLR-6148: Trying to fix Jenkins failures by not LazyLoading the ParallelExecutor in CoreAdminHandler

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java?rev=1601047&r1=1601046&r2=1601047&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java Sat Jun  7 00:53:56 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"));
   }