Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
This commit is contained in:
commit
a5a2ae6f45
|
@ -2,6 +2,8 @@ jetty-11.0.0-SNAPSHOT
|
|||
|
||||
jetty-11.0.0-alpha0
|
||||
|
||||
jetty-10.0.0.beta1
|
||||
|
||||
jetty-9.4.30.v20200611 - 11 June 2020
|
||||
+ 4776 Incorrect path matching for WebSocket using PathMappings
|
||||
+ 4826 Upgrade to Apache Jasper 8.5.54
|
||||
|
|
|
@ -56,7 +56,7 @@ public class MultiplexConnectionPool extends AbstractConnectionPool implements C
|
|||
public Connection acquire(boolean create)
|
||||
{
|
||||
Connection connection = activate();
|
||||
if (connection == null)
|
||||
if (connection == null && create)
|
||||
{
|
||||
int queuedRequests = getHttpDestination().getQueuedRequestCount();
|
||||
int maxMultiplex = getMaxMultiplex();
|
||||
|
|
Loading…
Reference in New Issue