diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/DispatchedIOFuture.java b/jetty-io/src/main/java/org/eclipse/jetty/io/DispatchedIOFuture.java index c430b1c393b..c58b66be85d 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/DispatchedIOFuture.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/DispatchedIOFuture.java @@ -175,7 +175,7 @@ public class DispatchedIOFuture implements IOFuture _lock.lock(); try { - if (!_complete) + while (!_complete) _block.await(); isReady(); } diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/SslConnection.java b/jetty-io/src/main/java/org/eclipse/jetty/io/SslConnection.java index 812ad5a7c3a..d782d283385 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/SslConnection.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/SslConnection.java @@ -239,7 +239,6 @@ public class SslConnection extends AbstractAsyncConnection @Override public void onIdleExpired(long idleForMs) { - System.err.println("LAST "+(System.currentTimeMillis()-_last)); _appConnection.onIdleExpired(idleForMs); } @@ -253,7 +252,6 @@ public class SslConnection extends AbstractAsyncConnection _lock.lock(); try { - System.err.println("onReadable"); _last=System.currentTimeMillis(); LOG.debug("onReadable {}",this); @@ -296,6 +294,7 @@ public class SslConnection extends AbstractAsyncConnection // Run any ready callback from _appReadFuture in this thread. _appReadFuture.run(); _appWriteFuture.run(); + } } diff --git a/jetty-io/src/test/java/org/eclipse/jetty/io/SelectChannelEndPointTest.java b/jetty-io/src/test/java/org/eclipse/jetty/io/SelectChannelEndPointTest.java index ae57cf65c58..2c1281091d3 100644 --- a/jetty-io/src/test/java/org/eclipse/jetty/io/SelectChannelEndPointTest.java +++ b/jetty-io/src/test/java/org/eclipse/jetty/io/SelectChannelEndPointTest.java @@ -131,7 +131,6 @@ public class SelectChannelEndPointTest @Override public synchronized void onReadable() { - System.err.println("APP onReadable"); try { _last=System.currentTimeMillis(); @@ -508,7 +507,7 @@ public class SelectChannelEndPointTest server.configureBlocking(false); _manager.register(server); - int writes = 10000; + int writes = 1000; final byte[] bytes="HelloWorld-".getBytes(StringUtil.__UTF8_CHARSET); byte[] count="0\n".getBytes(StringUtil.__UTF8_CHARSET);