diff options
author | Simone Bordet | 2015-02-12 13:27:09 +0000 |
---|---|---|
committer | Simone Bordet | 2015-02-12 13:27:09 +0000 |
commit | 968ed9f0ae84e0fb5f322ddd076a56a87aa67f41 (patch) | |
tree | d4edffb688760f25b79b8efb4b889ead9840d58a /jetty-proxy | |
parent | c449f1fa20742e7179b2d450caf24348c77fc61b (diff) | |
download | org.eclipse.jetty.project-968ed9f0ae84e0fb5f322ddd076a56a87aa67f41.tar.gz org.eclipse.jetty.project-968ed9f0ae84e0fb5f322ddd076a56a87aa67f41.tar.xz org.eclipse.jetty.project-968ed9f0ae84e0fb5f322ddd076a56a87aa67f41.zip |
Small updates to ProxyServletTest.
Diffstat (limited to 'jetty-proxy')
-rw-r--r-- | jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java index b6b9237f84..a4be2815b5 100644 --- a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java +++ b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java @@ -173,7 +173,10 @@ public class ProxyServletTest private HttpClient prepareClient() throws Exception { + QueuedThreadPool clientPool = new QueuedThreadPool(); + clientPool.setName("client"); HttpClient result = new HttpClient(); + result.setExecutor(clientPool); result.getProxyConfiguration().getProxies().add(new HttpProxy("localhost", proxyConnector.getLocalPort())); result.start(); return result; @@ -305,8 +308,19 @@ public class ProxyServletTest @Override protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - if (req.getHeader("Via") != null) - resp.addHeader(PROXIED_HEADER, "true"); + try + { + // Give some time to the proxy to + // upload the content to the server. + Thread.sleep(1000); + + if (req.getHeader("Via") != null) + resp.addHeader(PROXIED_HEADER, "true"); + } + catch (InterruptedException x) + { + throw new InterruptedIOException(); + } } }); startProxy(); |