Skip to content

Commit 1adb6d6

Browse files
authored
Merge pull request #277 from scalecube/update/reactor-Dysprosium-RELEASE
Updated reactor version to Dysprosium-RELEASE [DONT MERGE]
2 parents a0dbc18 + a902aa2 commit 1adb6d6

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

pom.xml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<slf4j.version>1.7.7</slf4j.version>
2626
<jackson.version>2.10.0.pr1</jackson.version>
2727
<log4j.version>2.8.2</log4j.version>
28-
<reactor.version>Californium-SR8</reactor.version>
28+
<reactor.version>Dysprosium-RELEASE</reactor.version>
2929

3030
<mockito-junit-jupiter.version>2.27.0</mockito-junit-jupiter.version>
3131
<junit-jupiter.version>5.1.1</junit-jupiter.version>
@@ -90,14 +90,11 @@
9090

9191
<!-- Jackson -->
9292
<dependency>
93-
<groupId>com.fasterxml.jackson.core</groupId>
94-
<artifactId>jackson-core</artifactId>
95-
<version>${jackson.version}</version>
96-
</dependency>
97-
<dependency>
98-
<groupId>com.fasterxml.jackson.core</groupId>
99-
<artifactId>jackson-databind</artifactId>
93+
<groupId>com.fasterxml.jackson</groupId>
94+
<artifactId>jackson-bom</artifactId>
10095
<version>${jackson.version}</version>
96+
<type>pom</type>
97+
<scope>import</scope>
10198
</dependency>
10299

103100
<!-- Reactor -->

transport-parent/transport-netty/src/main/java/io/scalecube/transport/netty/TransportImpl.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import reactor.netty.DisposableServer;
3737
import reactor.netty.NettyInbound;
3838
import reactor.netty.NettyOutbound;
39-
import reactor.netty.NettyPipeline.SendOptions;
4039
import reactor.netty.channel.BootstrapHandlers;
4140
import reactor.netty.resources.ConnectionProvider;
4241
import reactor.netty.resources.LoopResources;
@@ -290,10 +289,7 @@ private Message toMessage(ByteBuf byteBuf) {
290289

291290
private Mono<? extends Void> send0(Connection conn, Message message) {
292291
// do send
293-
return conn.outbound()
294-
.options(SendOptions::flushOnEach)
295-
.send(Mono.just(message).map(this::toByteBuf))
296-
.then();
292+
return conn.outbound().send(Mono.just(message).map(this::toByteBuf), bb -> true).then();
297293
}
298294

299295
private ByteBuf toByteBuf(Message message) {

0 commit comments

Comments
 (0)