andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

a48e5c73478d3e0704eb544b387b0c46130571cb merge build failure

Browse Source 
Motivation:
a48e5c73478d3e0704eb544b387b0c46130571cb from 4.1 introduced a build failure when merged to master.

Modifications:
- Resolve build failures due to interface changes.

Result:
Build now compiles.
This commit is contained in:
Scott Mitchell 2015-08-06 10:28:39 -07:00
parent a48e5c7347
commit 7f1bfbd7a5
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,8 @@ import io.netty.channel.ChannelOption;
import java.net.SocketAddress;
import static io.netty.channel.ChannelOption.valueOf;
/**
* Option for configuring the SCTP transport
*/

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

@ -18,6 +18,7 @@ package io.netty.channel.udt;
import com.barchart.udt.OptionUDT;
import io.netty.channel.ChannelOption;
import static io.netty.channel.ChannelOption.valueOf;
/**
* Options for the UDT transport
*/

1
transport/src/main/java/io/netty/channel/DefaultChannelConfig.java
View File

@ -25,7 +25,6 @@ import java.util.Map.Entry;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import static io.netty.channel.ChannelOption.ALLOCATOR;
import static io.netty.channel.ChannelOption.AUTO_CLOSE;
import static io.netty.channel.ChannelOption.AUTO_READ;
import static io.netty.channel.ChannelOption.CONNECT_TIMEOUT_MILLIS;
import static io.netty.channel.ChannelOption.MAX_MESSAGES_PER_READ;