You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2010/12/08 23:48:19 UTC
svn commit: r1043749 -
/lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
Author: yonik
Date: Wed Dec 8 22:48:19 2010
New Revision: 1043749
URL: http://svn.apache.org/viewvc?rev=1043749&view=rev
Log:
use non-nio jetty connector in tests
Modified:
lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
Modified: lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java?rev=1043749&r1=1043748&r2=1043749&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java (original)
+++ lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java Wed Dec 8 22:48:19 2010
@@ -29,7 +29,7 @@ import org.mortbay.component.LifeCycle;
import org.mortbay.jetty.Connector;
import org.mortbay.jetty.Handler;
import org.mortbay.jetty.Server;
-import org.mortbay.jetty.nio.SelectChannelConnector;
+import org.mortbay.jetty.bio.SocketConnector;
import org.mortbay.jetty.nio.SelectChannelConnector;
import org.mortbay.jetty.servlet.Context;
import org.mortbay.jetty.servlet.FilterHolder;
@@ -66,7 +66,9 @@ public class JettySolrRunner {
server = new Server(port);
server.setStopAtShutdown(true);
if (System.getProperty("jetty.testMode") != null) {
- SelectChannelConnector connector = new SelectChannelConnector();
+ // SelectChannelConnector connector = new SelectChannelConnector();
+ // Normal SocketConnector is what solr's example server uses by default
+ SocketConnector connector = new SocketConnector();
connector.setPort(port);
connector.setReuseAddress(true);
server.setConnectors(new Connector[] { connector });