aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Becker2013-07-26 11:40:57 (EDT)
committerThomas Becker2013-07-26 11:40:57 (EDT)
commitaf82e49835a627d84839bbe5dbbc79916af49110 (patch)
treefd0eee06ac813ca02f26d89e27061b950d741f01
parentfb04ee8fbddcca1698be38ffd73a6dace01703b8 (diff)
downloadorg.eclipse.jetty.project-af82e49835a627d84839bbe5dbbc79916af49110.zip
org.eclipse.jetty.project-af82e49835a627d84839bbe5dbbc79916af49110.tar.gz
org.eclipse.jetty.project-af82e49835a627d84839bbe5dbbc79916af49110.tar.bz2
ProxySPDYToSPDYLoadTest small change for shutting down the test
-rw-r--r--jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToSPDYLoadTest.java16
1 files changed, 5 insertions, 11 deletions
diff --git a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToSPDYLoadTest.java b/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToSPDYLoadTest.java
index 9ec5cc5..5f5ac53 100644
--- a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToSPDYLoadTest.java
+++ b/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToSPDYLoadTest.java
@@ -149,16 +149,10 @@ public class ProxySPDYToSPDYLoadTest
@After
public void destroy() throws Exception
{
- if (server != null)
- {
- server.stop();
- server.join();
- }
- if (proxy != null)
- {
- proxy.stop();
- proxy.join();
- }
+ server.stop();
+ server.join();
+ proxy.stop();
+ proxy.join();
factory.stop();
}
@@ -270,7 +264,7 @@ public class ProxySPDYToSPDYLoadTest
}
@Override
- public StreamFrameListener onSyn (Stream stream, SynInfo synInfo)
+ public StreamFrameListener onSyn(Stream stream, SynInfo synInfo)
{
Fields requestHeaders = synInfo.getHeaders();
Assert.assertNotNull(requestHeaders.get("via"));