Skip to content

Commit 7be6816

Browse files
committed
Merge branch '5.3.x'
2 parents 66d758d + 9eec6d0 commit 7be6816

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ configure(allprojects) { project ->
2929
imports {
3030
mavenBom "com.fasterxml.jackson:jackson-bom:2.13.1"
3131
mavenBom "io.netty:netty-bom:4.1.74.Final"
32-
mavenBom "io.projectreactor:reactor-bom:2020.0.16"
32+
mavenBom "io.projectreactor:reactor-bom:2020.0.17-SNAPSHOT"
3333
mavenBom "io.r2dbc:r2dbc-bom:Borca-RELEASE"
3434
mavenBom "io.rsocket:rsocket-bom:1.1.1"
3535
mavenBom "org.eclipse.jetty:jetty-bom:11.0.8"
@@ -250,6 +250,7 @@ configure(allprojects) { project ->
250250
repositories {
251251
mavenCentral()
252252
maven { url "https://repo.spring.io/libs-spring-framework-build" }
253+
maven { url "https://repo.spring.io/snapshot" } // reactor
253254
}
254255
}
255256
configurations.all {

spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2020 the original author or authors.
2+
* Copyright 2002-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -320,7 +320,7 @@ public Publisher<Void> apply(NettyInbound inbound, NettyOutbound outbound) {
320320
TcpConnection<P> connection = new ReactorNettyTcpConnection<>(inbound, outbound, codec, completionSink);
321321
scheduler.schedule(() -> this.connectionHandler.afterConnected(connection));
322322

323-
inbound.withConnection(conn -> conn.addHandler(new StompMessageDecoder<>(codec)));
323+
inbound.withConnection(conn -> conn.addHandlerFirst(new StompMessageDecoder<>(codec)));
324324

325325
inbound.receiveObject()
326326
.cast(Message.class)

0 commit comments

Comments
 (0)