You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2015/02/05 09:42:56 UTC
svn commit: r1657495 -
/lucene/dev/trunk/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
Author: shalin
Date: Thu Feb 5 08:42:56 2015
New Revision: 1657495
URL: http://svn.apache.org/r1657495
Log:
SOLR-4839: Avoid NPE when jetty.testMode=false
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java?rev=1657495&r1=1657494&r2=1657495&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java Thu Feb 5 08:42:56 2015
@@ -148,10 +148,6 @@ public class JettySolrRunner {
}
}
-
-
-
-
public JettySolrRunner(String solrHome, String context, int port) {
this.init(solrHome, context, port, true);
this.name = "jetty-" + JETTY_ID_COUNTER.incrementAndGet();
@@ -218,11 +214,19 @@ public class JettySolrRunner {
private void init(String solrHome, String context, int port, boolean stopAtShutdown) {
this.context = context;
-
this.solrHome = solrHome;
this.stopAtShutdown = stopAtShutdown;
System.setProperty("solr.solr.home", solrHome);
+
+ QueuedThreadPool qtp = new QueuedThreadPool();
+ qtp.setMaxThreads(10000);
+ qtp.setIdleTimeout((int) TimeUnit.SECONDS.toMillis(5));
+ qtp.setStopTimeout((int) TimeUnit.MINUTES.toMillis(1));
+ server = new Server(qtp);
+ server.manage(qtp);
+ server.setStopAtShutdown(stopAtShutdown);
+
if (System.getProperty("jetty.testMode") != null) {
// if this property is true, then jetty will be configured to use SSL
// leveraging the same system properties as java to specify
@@ -237,15 +241,6 @@ public class JettySolrRunner {
final SslContextFactory sslcontext = new SslContextFactory(false);
sslInit(useSsl, sslcontext);
- QueuedThreadPool qtp = new QueuedThreadPool();
- qtp.setMaxThreads(10000);
- qtp.setIdleTimeout((int) TimeUnit.SECONDS.toMillis(5));
- qtp.setStopTimeout((int) TimeUnit.MINUTES.toMillis(1));
-
- server = new Server(qtp);
- server.setStopAtShutdown(stopAtShutdown);
- server.manage(qtp);
-
ServerConnector connector;
if (useSsl) {
HttpConfiguration configuration = new HttpConfiguration();
@@ -273,15 +268,7 @@ public class JettySolrRunner {
} else {
ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory());
connector.setPort(port);
-
- QueuedThreadPool qtp = new QueuedThreadPool();
- qtp.setMaxThreads(10000);
- qtp.setIdleTimeout((int) TimeUnit.SECONDS.toMillis(5));
- qtp.setStopTimeout((int) TimeUnit.SECONDS.toMillis(1));
-
- server = new Server(qtp);
- server.setStopAtShutdown(stopAtShutdown);
- server.manage(qtp);
+ server.setConnectors(new Connector[] {connector});
}
// Initialize the servlets