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

Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.

This commit is contained in:
Simone Bordet 2020-07-09 16:19:24 +02:00
parent d31bbb2195 94956d6e8b
commit 113595254b
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jetty-client/src/main/java/org/eclipse/jetty/client/AbstractConnectionPool.java
View File

@ -92,9 +92,8 @@ public abstract class AbstractConnectionPool implements ConnectionPool, Dumpable
public Connection acquire(boolean create) public Connection acquire(boolean create)
{ {
Connection connection = activate(); Connection connection = activate();
if (connection == null) if (connection == null && create)
{ {
if (create)
tryCreate(destination.getQueuedRequestCount()); tryCreate(destination.getQueuedRequestCount());
connection = activate(); connection = activate();
} }

2
jetty-http2/http2-http-client-transport/src/test/java/org/eclipse/jetty/http2/client/http/MaxConcurrentStreamsTest.java
View File

@ -175,6 +175,7 @@ public class MaxConcurrentStreamsTest extends AbstractTest
@Override @Override
public void onSettings(Session session, SettingsFrame frame) public void onSettings(Session session, SettingsFrame frame)
{ {
super.onSettings(session, frame);
// Send another request to simulate a request being // Send another request to simulate a request being
// sent concurrently with connection establishment. // sent concurrently with connection establishment.
// Sending this request will trigger the creation of // Sending this request will trigger the creation of
@ -199,7 +200,6 @@ public class MaxConcurrentStreamsTest extends AbstractTest
} }
}); });
} }
super.onSettings(session, frame);
} }
}, promise, context); }, promise, context);
} }