Skip to content

Commit 541a5e6

Browse files
committed
Revert "Upgrade to Netty 4.2.0.Final"
This reverts commit a7a80a6. See gh-45122
1 parent 7b7a11d commit 541a5e6

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

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

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

@@ -88,7 +86,7 @@ StandardMongoClientSettingsBuilderCustomizer standardMongoSettingsCustomizer(Mon
8886
}
8987

9088
@Configuration(proxyBeanMethods = false)
91-
@ConditionalOnClass({ SocketChannel.class, MultiThreadIoEventLoopGroup.class })
89+
@ConditionalOnClass({ SocketChannel.class, NioEventLoopGroup.class })
9290
static class NettyDriverConfiguration {
9391

9492
@Bean
@@ -117,8 +115,7 @@ static final class NettyDriverMongoClientSettingsBuilderCustomizer
117115
@Override
118116
public void customize(Builder builder) {
119117
if (!isCustomTransportConfiguration(this.settings.getIfAvailable())) {
120-
IoHandlerFactory ioHandlerFactory = NioIoHandler.newFactory();
121-
MultiThreadIoEventLoopGroup eventLoopGroup = new MultiThreadIoEventLoopGroup(ioHandlerFactory);
118+
NioEventLoopGroup eventLoopGroup = new NioEventLoopGroup();
122119
this.eventLoopGroup = eventLoopGroup;
123120
builder.transportSettings(TransportSettings.nettyBuilder().eventLoopGroup(eventLoopGroup).build());
124121
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1646,7 +1646,7 @@ bom {
16461646
releaseNotes("https://github.com/neo4j/neo4j-java-driver/releases/tag/{version}")
16471647
}
16481648
}
1649-
library("Netty", "4.2.0.Final") {
1649+
library("Netty", "4.1.119.Final") {
16501650
prohibit {
16511651
contains ".Alpha"
16521652
contains ".Beta"

0 commit comments

Comments
 (0)