Skip to content

Commit a7a80a6

Browse files
committed
Upgrade to Netty 4.2.0.Final
Closes gh-45122
1 parent 1791459 commit a7a80a6

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
import com.mongodb.connection.TransportSettings;
2222
import com.mongodb.reactivestreams.client.MongoClient;
2323
import io.netty.channel.EventLoopGroup;
24-
import io.netty.channel.nio.NioEventLoopGroup;
24+
import io.netty.channel.IoHandlerFactory;
25+
import io.netty.channel.MultiThreadIoEventLoopGroup;
26+
import io.netty.channel.nio.NioIoHandler;
2527
import io.netty.channel.socket.SocketChannel;
2628
import reactor.core.publisher.Flux;
2729

@@ -86,7 +88,7 @@ StandardMongoClientSettingsBuilderCustomizer standardMongoSettingsCustomizer(Mon
8688
}
8789

8890
@Configuration(proxyBeanMethods = false)
89-
@ConditionalOnClass({ SocketChannel.class, NioEventLoopGroup.class })
91+
@ConditionalOnClass({ SocketChannel.class, MultiThreadIoEventLoopGroup.class })
9092
static class NettyDriverConfiguration {
9193

9294
@Bean
@@ -115,7 +117,8 @@ static final class NettyDriverMongoClientSettingsBuilderCustomizer
115117
@Override
116118
public void customize(Builder builder) {
117119
if (!isCustomTransportConfiguration(this.settings.getIfAvailable())) {
118-
NioEventLoopGroup eventLoopGroup = new NioEventLoopGroup();
120+
IoHandlerFactory ioHandlerFactory = NioIoHandler.newFactory();
121+
MultiThreadIoEventLoopGroup eventLoopGroup = new MultiThreadIoEventLoopGroup(ioHandlerFactory);
119122
this.eventLoopGroup = eventLoopGroup;
120123
builder.transportSettings(TransportSettings.nettyBuilder().eventLoopGroup(eventLoopGroup).build());
121124
}

spring-boot-project/spring-boot-dependencies/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1653,7 +1653,7 @@ bom {
16531653
releaseNotes("https://github.com/neo4j/neo4j-java-driver/releases/tag/{version}")
16541654
}
16551655
}
1656-
library("Netty", "4.1.119.Final") {
1656+
library("Netty", "4.2.0.Final") {
16571657
prohibit {
16581658
contains ".Alpha"
16591659
contains ".Beta"

0 commit comments

Comments
 (0)