Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed proxy tests

This commit is contained in:
Greg Wilkins 2013-10-01 10:38:50 +10:00
parent 3fb3616b21
commit 2ef92d5477
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
View File

@ -258,6 +258,8 @@ public class ProxyServlet extends HttpServlet
if (value == null || "-".equals(value))
{
executor = (Executor)getServletContext().getAttribute("org.eclipse.jetty.server.Executor");
if (executor==null)
throw new IllegalStateException("No server executor for proxy");
}
else
{

9
jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java
View File

@ -239,7 +239,7 @@ public class ProxyServletTest
result.setProxyConfiguration(new ProxyConfiguration("localhost", proxyConnector.getLocalPort()));
QueuedThreadPool threadPool = new QueuedThreadPool();
threadPool.setName("foo");
threadPool.setMaxThreads(2);
threadPool.setMaxThreads(20);
result.setExecutor(threadPool);
result.start();
@ -269,10 +269,9 @@ public class ProxyServletTest
for ( int i = 0; i < 10; ++i )
{
Assert.assertEquals(200, responses[i].getStatus());
Assert.assertTrue(responses[i].getHeaders().containsKey(PROXIED_HEADER));
Assert.assertArrayEquals(content, responses[i].getContent());
Assert.assertEquals(200, responses[i].getStatus());
Assert.assertTrue(responses[i].getHeaders().containsKey(PROXIED_HEADER));
Assert.assertArrayEquals(content, responses[i].getContent());
}
}