Skip to content

Commit

Permalink
Merge pull request #277 from scalecube/update/reactor-Dysprosium-RELEASE
Browse files Browse the repository at this point in the history
Updated reactor version to Dysprosium-RELEASE [DONT MERGE]
  • Loading branch information
artem-v authored Jan 2, 2020
2 parents a0dbc18 + a902aa2 commit 1adb6d6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 13 deletions.
13 changes: 5 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<slf4j.version>1.7.7</slf4j.version>
<jackson.version>2.10.0.pr1</jackson.version>
<log4j.version>2.8.2</log4j.version>
<reactor.version>Californium-SR8</reactor.version>
<reactor.version>Dysprosium-RELEASE</reactor.version>

<mockito-junit-jupiter.version>2.27.0</mockito-junit-jupiter.version>
<junit-jupiter.version>5.1.1</junit-jupiter.version>
Expand Down Expand Up @@ -90,14 +90,11 @@

<!-- Jackson -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- Reactor -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import reactor.netty.DisposableServer;
import reactor.netty.NettyInbound;
import reactor.netty.NettyOutbound;
import reactor.netty.NettyPipeline.SendOptions;
import reactor.netty.channel.BootstrapHandlers;
import reactor.netty.resources.ConnectionProvider;
import reactor.netty.resources.LoopResources;
Expand Down Expand Up @@ -290,10 +289,7 @@ private Message toMessage(ByteBuf byteBuf) {

private Mono<? extends Void> send0(Connection conn, Message message) {
// do send
return conn.outbound()
.options(SendOptions::flushOnEach)
.send(Mono.just(message).map(this::toByteBuf))
.then();
return conn.outbound().send(Mono.just(message).map(this::toByteBuf), bb -> true).then();
}

private ByteBuf toByteBuf(Message message) {
Expand Down

0 comments on commit 1adb6d6

Please sign in to comment.