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

Revert unnecessary change in Bootstrap

Browse Source
This commit is contained in:
Trustin Lee 2012-07-07 14:37:44 +09:00
parent 4f9b6c5bad
commit 9535401632
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
transport/src/main/java/io/netty/bootstrap/ServerBootstrap.java
View File

@ -41,7 +41,6 @@ import java.nio.channels.ClosedChannelException;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Queue;
public class ServerBootstrap { public class ServerBootstrap {
@ -167,6 +166,13 @@ public class ServerBootstrap {
return future; return future;
} }
try {
channel.config().setOptions(parentOptions);
} catch (Exception e) {
future.setFailure(e);
return future;
}
ChannelPipeline p = channel.pipeline(); ChannelPipeline p = channel.pipeline();
if (handler != null) { if (handler != null) {
p.addLast(handler); p.addLast(handler);
@ -178,12 +184,6 @@ public class ServerBootstrap {
future.setFailure(f.cause()); future.setFailure(f.cause());
return future; return future;
} }
try {
channel.config().setOptions(parentOptions);
} catch (Exception e) {
future.setFailure(e);
return future;
}
if (!channel.isOpen()) { if (!channel.isOpen()) {
// Registration was successful but the channel was closed due to some failure in // Registration was successful but the channel was closed due to some failure in