Merge branch '2.0.x'

This commit is contained in:
Phillip Webb
2018-07-29 09:28:56 +01:00
48 changed files with 57 additions and 58 deletions

View File

@@ -161,8 +161,7 @@ public class HttpTunnelConnectionTests {
private TunnelChannel openTunnel(boolean singleThreaded) throws Exception {
HttpTunnelConnection connection = new HttpTunnelConnection(this.url,
this.requestFactory,
(singleThreaded ? new CurrentThreadExecutor() : null));
this.requestFactory, singleThreaded ? new CurrentThreadExecutor() : null);
return connection.open(this.incomingChannel, this.closeable);
}