Update Reactor Core version to 3.1.4.RELEASE

Everywhere when we return Mono<Void> and use Mono.zip(...).then() we will use Mono.when(...).
reactor · Feb 15, 2018 · d22208f · d22208f
1 parent 9e33be5
commit d22208f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -48,7 +48,7 @@ ext {
   gradleVersion = '3.3'
   gradleScriptDir = "${rootProject.projectDir}/gradle"
 
-  reactorCoreVersion = "3.1.4.BUILD-SNAPSHOT"
+  reactorCoreVersion = "3.1.4.RELEASE"
 
   // Languages
   groovyVersion = '2.4.1'

diff --git a/src/main/java/reactor/ipc/netty/resources/DefaultLoopResources.java b/src/main/java/reactor/ipc/netty/resources/DefaultLoopResources.java
@@ -129,7 +129,7 @@ public Mono<Void> disposeLater() {
 				cnsrvlMono = FutureMono.from((Future) cacheNativeServerGroup.terminationFuture());
 			}
 
-			return Mono.zip(clMono, sslMono, slMono, cnclMono, cnslMono, cnsrvlMono).then();
+			return Mono.when(clMono, sslMono, slMono, cnclMono, cnslMono, cnsrvlMono);
 		});
 	}
 

diff --git a/src/main/java/reactor/ipc/netty/tcp/TcpResources.java b/src/main/java/reactor/ipc/netty/tcp/TcpResources.java
@@ -137,10 +137,9 @@ protected void _dispose(){
 	 * @return the Mono that represents the end of disposal
 	 */
 	protected Mono<Void> _disposeLater() {
-		return Mono.zip(
+		return Mono.when(
 				defaultLoops.disposeLater(),
-				defaultPools.disposeLater())
-		           .then();
+				defaultPools.disposeLater());
 	}
 
 	@Override