1 files changed, 7 insertions, 14 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 dfb7f38a29..5f5ac53833 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
@@ -19,7 +19,6 @@
 package org.eclipse.jetty.spdy.server.proxy;
 
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -150,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();
     }
 
@@ -203,13 +196,13 @@ public class ProxySPDYToSPDYLoadTest
             {
                 try
                 {
-                    Session client = factory.newSPDYClient(version).connect(proxyAddress, null).get(5, TimeUnit.SECONDS);
+                    Session client = factory.newSPDYClient(version).connect(proxyAddress, null);
                     for (int i = 0; i < requestsPerClient; i++)
                     {
                         sendSingleClientRequest(proxyAddress, client, serverIdentificationString, serverHost);
                     }
                 }
-                catch (InterruptedException | ExecutionException | TimeoutException | IOException e)
+                catch (InterruptedException | ExecutionException | TimeoutException e)
                 {
                     fail();
                     e.printStackTrace();
@@ -271,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"));