Create LoopResources/PoolResources only in case the user does not spe…

…cify their own.
reactor · Sep 19, 2017 · 336a4c1 · 336a4c1
1 parent 59beb9d
commit 336a4c1
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 7 deletions.
diff --git a/src/main/java/reactor/ipc/netty/http/client/HttpClient.java b/src/main/java/reactor/ipc/netty/http/client/HttpClient.java
@@ -132,11 +132,13 @@ public static HttpClient.Builder builder() {
 
 	private HttpClient(HttpClient.Builder builder) {
 		HttpClientOptions.Builder clientOptionsBuilder = HttpClientOptions.builder();
-		clientOptionsBuilder.loopResources(HttpResources.get())
-		                    .poolResources(HttpResources.get());
 		if (Objects.nonNull(builder.options)) {
 			builder.options.accept(clientOptionsBuilder);
 		}
+		clientOptionsBuilder.loopResources(HttpResources.get());
+		if (!clientOptionsBuilder.isPoolDisabled()) {
+			clientOptionsBuilder.poolResources(HttpResources.get());
+		}
 		this.options = clientOptionsBuilder.build();
 		this.client = new TcpBridgeClient(options);
 	}

diff --git a/src/main/java/reactor/ipc/netty/http/server/HttpServer.java b/src/main/java/reactor/ipc/netty/http/server/HttpServer.java
@@ -121,14 +121,14 @@ public static HttpServer.Builder builder() {
 
 	private HttpServer(HttpServer.Builder builder) {
 		HttpServerOptions.Builder serverOptionsBuilder = HttpServerOptions.builder();
-		serverOptionsBuilder.loopResources(HttpResources.get());
 		if (Objects.isNull(builder.options)) {
 			serverOptionsBuilder.host(builder.bindAddress)
 			                    .port(builder.port);
 		}
 		else {
 			builder.options.accept(serverOptionsBuilder);
 		}
+		serverOptionsBuilder.loopResources(HttpResources.get());
 		this.options = serverOptionsBuilder.build();
 		this.server = new TcpBridgeServer(this.options);
 	}

diff --git a/src/main/java/reactor/ipc/netty/options/ClientOptions.java b/src/main/java/reactor/ipc/netty/options/ClientOptions.java
@@ -252,6 +252,7 @@ public String toString() {
 	public static class Builder<BUILDER extends Builder<BUILDER>>
 			extends NettyOptions.Builder<Bootstrap, ClientOptions, BUILDER> {
 		private PoolResources poolResources;
+		private boolean poolDisabled = false;
 		private InternetProtocolFamily protocolFamily;
 		private String host;
 		private int port = -1;
@@ -299,6 +300,7 @@ public final BUILDER resolver(AddressResolverGroup<?> resolver) {
 		 */
 		public final BUILDER poolResources(PoolResources poolResources) {
 			this.poolResources = Objects.requireNonNull(poolResources, "poolResources");
+			this.poolDisabled = false;
 			return get();
 		}
 
@@ -309,9 +311,14 @@ public final BUILDER poolResources(PoolResources poolResources) {
 		 */
 		public BUILDER disablePool() {
 			this.poolResources = null;
+			this.poolDisabled = true;
 			return get();
 		}
 
+		public final boolean isPoolDisabled() {
+			return poolDisabled;
+		}
+
 		/**
 		 * Configures the version family for the socket.
 		 *

diff --git a/src/main/java/reactor/ipc/netty/tcp/TcpClient.java b/src/main/java/reactor/ipc/netty/tcp/TcpClient.java
@@ -118,11 +118,13 @@ public static TcpClient.Builder builder() {
 
 	protected TcpClient(TcpClient.Builder builder) {
 		ClientOptions.Builder<?> clientOptionsBuilder = ClientOptions.builder();
-		clientOptionsBuilder.loopResources(TcpResources.get())
-		                    .poolResources(TcpResources.get());
 		if (Objects.nonNull(builder.options)) {
 			builder.options.accept(clientOptionsBuilder);
 		}
+		clientOptionsBuilder.loopResources(TcpResources.get());
+		if (!clientOptionsBuilder.isPoolDisabled()) {
+			clientOptionsBuilder.poolResources(TcpResources.get());
+		}
 		this.options = clientOptionsBuilder.build();
 	}
 

diff --git a/src/main/java/reactor/ipc/netty/tcp/TcpServer.java b/src/main/java/reactor/ipc/netty/tcp/TcpServer.java
@@ -133,14 +133,14 @@ public static TcpServer.Builder builder() {
 
 	protected TcpServer(TcpServer.Builder builder) {
 		ServerOptions.Builder<?> serverOptionsBuilder = ServerOptions.builder();
-		serverOptionsBuilder.loopResources(TcpResources.get());
 		if (Objects.isNull(builder.options)) {
 			serverOptionsBuilder.host(builder.bindAddress)
 			                    .port(builder.port);
 		}
 		else {
 			builder.options.accept(serverOptionsBuilder);
 		}
+		serverOptionsBuilder.loopResources(TcpResources.get());
 		this.options = serverOptionsBuilder.build();
 	}
 

diff --git a/src/main/java/reactor/ipc/netty/udp/UdpClient.java b/src/main/java/reactor/ipc/netty/udp/UdpClient.java
@@ -120,10 +120,10 @@ public static UdpClient.Builder builder() {
 
 	private UdpClient(UdpClient.Builder builder) {
 		UdpClientOptions.Builder clientOptionsBuilder = UdpClientOptions.builder();
-		clientOptionsBuilder.loopResources(DEFAULT_UDP_LOOPS);
 		if (Objects.nonNull(builder.options)) {
 			builder.options.accept(clientOptionsBuilder);
 		}
+		clientOptionsBuilder.loopResources(DEFAULT_UDP_LOOPS);
 		this.options = clientOptionsBuilder.build();
 	}