410498 ignore type of exception in GoAwayTest.testDataNotProcessedAfterGoAway

2 files changed, 3 insertions, 4 deletions

diff --git a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java
index b77b9d6e54..c56210fbe2 100644
--- a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java
+++ b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java
@@ -62,7 +62,7 @@ public class SPDYConnection extends AbstractConnection implements Controller, Id
         //
         // Due to a jvm bug we've had a Selector thread being stuck at
         // sun.nio.ch.FileDispatcherImpl.preClose0(Native Method). That's why we now default executeOnFillable to
-        // true even if for most use cases it is faster to not dispatch the IO events.  
+        // true even if for most use cases it is faster to not dispatch the IO events.
         super(endPoint, executor, executeOnFillable);
         this.bufferPool = bufferPool;
         this.parser = parser;
diff --git a/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/GoAwayTest.java b/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/GoAwayTest.java
index 9a4b3f35d9..5e8e301db0 100644
--- a/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/GoAwayTest.java
+++ b/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/GoAwayTest.java
@@ -24,7 +24,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.eclipse.jetty.io.EofException;
 import org.eclipse.jetty.spdy.api.DataInfo;
 import org.eclipse.jetty.spdy.api.GoAwayInfo;
 import org.eclipse.jetty.spdy.api.GoAwayResultInfo;
@@ -41,7 +40,6 @@ import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.util.Fields;
 import org.eclipse.jetty.util.FutureCallback;
 import org.eclipse.jetty.util.FuturePromise;
-import org.hamcrest.CoreMatchers;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -223,7 +221,8 @@ public class GoAwayTest extends AbstractTest
         }
         catch (ExecutionException x)
         {
-            Assert.assertThat(x.getCause(), CoreMatchers.instanceOf(EofException.class));
+            // doesn't matter which exception we get, it's important that the data is not been written and the
+            // previous assertion is true
         }
 
         // The last good stream is the second, because it was received by the server