aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Becker2013-08-13 07:34:54 (EDT)
committerThomas Becker2013-08-13 07:35:06 (EDT)
commit75f87a289a87e0b8d8ae7acb199f80e881baff50 (patch)
treecce09e7718ae838802548e6ea72a79e5a4e9c34f
parent80b422c0e45d1fefdab130f4da2fd175ce568e5d (diff)
downloadorg.eclipse.jetty.project-75f87a289a87e0b8d8ae7acb199f80e881baff50.zip
org.eclipse.jetty.project-75f87a289a87e0b8d8ae7acb199f80e881baff50.tar.gz
org.eclipse.jetty.project-75f87a289a87e0b8d8ae7acb199f80e881baff50.tar.bz2
414951 QueuedThreadPool fix constructor that missed to pass the idleTimeout
-rw-r--r--jetty-server/src/main/java/org/eclipse/jetty/server/Request.java2
-rw-r--r--jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java2
2 files changed, 1 insertions, 3 deletions
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
index ffe98f1..c3733f4 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
@@ -38,7 +38,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-
import javax.servlet.AsyncContext;
import javax.servlet.AsyncListener;
import javax.servlet.DispatcherType;
@@ -63,7 +62,6 @@ import org.eclipse.jetty.http.HttpCookie;
import org.eclipse.jetty.http.HttpFields;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.HttpMethod;
-import org.eclipse.jetty.http.HttpScheme;
import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.http.HttpURI;
import org.eclipse.jetty.http.HttpVersion;
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java
index 0febc24..7c8b5e6 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java
@@ -80,7 +80,7 @@ public class QueuedThreadPool extends AbstractLifeCycle implements SizedThreadPo
public QueuedThreadPool(@Name("maxThreads") int maxThreads, @Name("minThreads") int minThreads, @Name("idleTimeout")int idleTimeout)
{
- this(maxThreads, minThreads, 60000,null);
+ this(maxThreads, minThreads, idleTimeout, null);
}
public QueuedThreadPool(@Name("maxThreads") int maxThreads, @Name("minThreads") int minThreads, @Name("idleTimeout") int idleTimeout, @Name("queue") BlockingQueue<Runnable> queue)