commit e1056bb646363e338fac94580f1dfd7fabbe525b
author Dave Borowitz <dborowitz@google.com> Fri Jan 11 10:31:37 2013 -0800
committer Dave Borowitz <dborowitz@google.com> Fri Jan 11 10:38:25 2013 -0800
tree 911cf7aa3ee18e2b28c21ec64a8ac8df0de772d6
parent 231b4548e685416fc6c86d9dbdcdfcfaa88aae05

Use Jetty's SocketConnector instead of SelectChannelConnector

Performance is not important for the development server, and our user
who is having issues with Jetty is having issues specifically in the NIO
code; this fixes the problem for him.

Change-Id: Ic15984be4e92d159f5060e47bb2ec7abce274fa8

gitiles-dev/src/main/java/com/google/gitiles/dev/DevServer.java

diff --git a/gitiles-dev/src/main/java/com/google/gitiles/dev/DevServer.java b/gitiles-dev/src/main/java/com/google/gitiles/dev/DevServer.java
index dec9b48..a52b4e3 100644
--- a/gitiles-dev/src/main/java/com/google/gitiles/dev/DevServer.java
+++ b/gitiles-dev/src/main/java/com/google/gitiles/dev/DevServer.java
@@ -24,10 +24,10 @@
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.bio.SocketConnector;
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 import org.eclipse.jetty.server.handler.ResourceHandler;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.util.resource.FileResource;
@@ -156,7 +156,7 @@
   }
 
   private Connector[] connectors() {
-    Connector c = new SelectChannelConnector();
+    Connector c = new SocketConnector();
     c.setHost(null);
     c.setPort(cfg.getInt("gitiles", null, "port", 8080));
     c.setStatsOn(false);