Skip to content

Commit 7f1bfbd

Browse files
committed
a48e5c7 merge build failure
Motivation: a48e5c7 from 4.1 introduced a build failure when merged to master. Modifications: - Resolve build failures due to interface changes. Result: Build now compiles.
1 parent a48e5c7 commit 7f1bfbd

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

transport-sctp/src/main/java/io/netty/channel/sctp/SctpChannelOption.java

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020

2121
import java.net.SocketAddress;
2222

23+
import static io.netty.channel.ChannelOption.valueOf;
24+
2325
/**
2426
* Option for configuring the SCTP transport
2527
*/

transport-udt/src/main/java/io/netty/channel/udt/UdtChannelOption.java

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import com.barchart.udt.OptionUDT;
1919
import io.netty.channel.ChannelOption;
2020

21+
import static io.netty.channel.ChannelOption.valueOf;
2122
/**
2223
* Options for the UDT transport
2324
*/

transport/src/main/java/io/netty/channel/DefaultChannelConfig.java

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
2626

2727
import static io.netty.channel.ChannelOption.ALLOCATOR;
28-
import static io.netty.channel.ChannelOption.AUTO_CLOSE;
2928
import static io.netty.channel.ChannelOption.AUTO_READ;
3029
import static io.netty.channel.ChannelOption.CONNECT_TIMEOUT_MILLIS;
3130
import static io.netty.channel.ChannelOption.MAX_MESSAGES_PER_READ;

0 commit comments

Comments
 (0)