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

Issue #2860 fixes after review

This commit is contained in:
Ivanov Anton 2018-08-26 21:34:20 +03:00
parent 084d6ce443
commit a458bfaaf4
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jetty-client/src/main/java/org/eclipse/jetty/client/PoolingHttpDestination.java
View File

@ -210,7 +210,7 @@ public abstract class PoolingHttpDestination<C extends Connection> extends HttpD
if (getHttpExchanges().isEmpty())
{
removeDestinationIfIdle();
tryRemoveIdleDestination();
}
else
{
@ -231,12 +231,12 @@ public abstract class PoolingHttpDestination<C extends Connection> extends HttpD
public void abort(Throwable cause)
{
super.abort(cause);
if (getHttpExchanges().isEmpty()) {
removeDestinationIfIdle();
}
if (getHttpExchanges().isEmpty())
tryRemoveIdleDestination();
}
private void removeDestinationIfIdle() {
private void tryRemoveIdleDestination()
{
if (getHttpClient().isRemoveIdleDestinations() && connectionPool.isEmpty())
{
// There is a race condition between this thread removing the destination

14
jetty-client/src/test/java/org/eclipse/jetty/client/http/HttpDestinationOverHTTPTest.java
View File

@ -39,7 +39,6 @@ import org.eclipse.jetty.http.HttpHeaderValue;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.hamcrest.Matchers;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
@ -287,21 +286,22 @@ public class HttpDestinationOverHTTPTest extends AbstractHttpClientServerTest
String host = "localhost";
int port = connector.getLocalPort();
client.setRemoveIdleDestinations(true);
Assume.assumeTrue("Destinations of a fresh client must be empty", client.getDestinations().isEmpty());
Assert.assertTrue("Destinations of a fresh client must be empty", client.getDestinations().isEmpty());
server.stop();
Request request = client.newRequest(host, port).scheme(this.scheme);
try
{
request.send();
Assume.assumeTrue("Request to a closed port must fail", false);
} catch (Exception ignored) {
Assert.fail("Request to a closed port must fail");
} catch (Exception ignored)
{
}
long deadline = System.currentTimeMillis() + 100;
while (!client.getDestinations().isEmpty() && System.currentTimeMillis() < deadline)
long deadline = System.nanoTime() + TimeUnit.MILLISECONDS.toNanos(100);
while (!client.getDestinations().isEmpty() && System.nanoTime() < deadline)
{
Thread.yield();
Thread.sleep(10);
}
Assert.assertTrue("Destination must be removed after connection error", client.getDestinations().isEmpty());
}