Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed unneeded execute for SslConnection onFillable

This commit is contained in:
Greg Wilkins 2015-01-02 15:24:14 +01:00
parent 39b478e2c4
commit a4d2895400
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesServerTest.java
View File

@ -1362,8 +1362,8 @@ public class SslBytesServerTest extends SslBytesTest
// Check that we did not spin
TimeUnit.MILLISECONDS.sleep(500);
Assert.assertThat(sslFills.get(), Matchers.lessThan(50));
Assert.assertThat(sslFlushes.get(), Matchers.lessThan(20));
Assert.assertThat(sslFills.get(), Matchers.lessThan(100));
Assert.assertThat(sslFlushes.get(), Matchers.lessThan(50));
Assert.assertThat(httpParses.get(), Matchers.lessThan(100));
Assert.assertNull(request.get(5, TimeUnit.SECONDS));
@ -1384,8 +1384,8 @@ public class SslBytesServerTest extends SslBytesTest
// Check that we did not spin
TimeUnit.MILLISECONDS.sleep(500);
Assert.assertThat(sslFills.get(), Matchers.lessThan(50));
Assert.assertThat(sslFlushes.get(), Matchers.lessThan(20));
Assert.assertThat(sslFills.get(), Matchers.lessThan(100));
Assert.assertThat(sslFlushes.get(), Matchers.lessThan(50));
Assert.assertThat(httpParses.get(), Matchers.lessThan(100));
closeClient(client);

8
jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
View File

@ -34,7 +34,6 @@ import org.eclipse.jetty.io.ByteBufferPool;
import org.eclipse.jetty.io.Connection;
import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.io.EofException;
import org.eclipse.jetty.io.FillInterest;
import org.eclipse.jetty.io.RuntimeIOException;
import org.eclipse.jetty.io.SelectChannelEndPoint;
import org.eclipse.jetty.io.WriteFlusher;
@ -197,7 +196,7 @@ public class SslConnection extends AbstractConnection
if (_decryptedEndPoint._flushRequiresFillToProgress)
{
_decryptedEndPoint._flushRequiresFillToProgress = false;
getExecutor().execute(_runCompletWrite);
_runCompletWrite.run();
}
}
@ -279,7 +278,7 @@ public class SslConnection extends AbstractConnection
}
if (fillable)
getFillInterest().fillable();
getExecutor().execute(_runCompletWrite);
_runCompletWrite.run();
}
@Override
@ -396,8 +395,7 @@ public class SslConnection extends AbstractConnection
else
{
// try to flush what is pending
// because this is a special case (see above) we could probably
// avoid the dispatch, but best to be sure
// execute to avoid recursion
getExecutor().execute(_runCompletWrite);
}
}

2
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletIOTest.java
View File

@ -60,7 +60,7 @@ import org.junit.Test;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.assertEquals;
// TODO need these on SPDY as well!
// TODO need these on HTTP2 as well!
public class AsyncServletIOTest
{
private static final Logger LOG = Log.getLogger(AsyncServletIOTest.class);