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

Fix #129: Memory leak when setOptions() fails while accepting a new connection

Browse Source
This commit is contained in:
Trustin Lee 2011-12-15 16:38:45 +09:00
parent f779a4415c
commit 62446827df
3 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/io/netty/bootstrap/ClientBootstrap.java
View File

@ -209,7 +209,15 @@ public class ClientBootstrap extends Bootstrap {
// Set the options. // Set the options.
Channel ch = getFactory().newChannel(pipeline); Channel ch = getFactory().newChannel(pipeline);
ch.getConfig().setOptions(getOptions()); boolean success = false;
try {
ch.getConfig().setOptions(getOptions());
success = true;
} finally {
if (!success) {
ch.close();
}
}
// Bind. // Bind.
if (localAddress != null) { if (localAddress != null) {

23
src/main/java/io/netty/bootstrap/ConnectionlessBootstrap.java
View File

@ -183,8 +183,16 @@ public class ConnectionlessBootstrap extends Bootstrap {
Channel ch = getFactory().newChannel(pipeline); Channel ch = getFactory().newChannel(pipeline);
// Apply options. // Apply options.
ch.getConfig().setPipelineFactory(getPipelineFactory()); boolean success = false;
ch.getConfig().setOptions(getOptions()); try {
ch.getConfig().setPipelineFactory(getPipelineFactory());
ch.getConfig().setOptions(getOptions());
success = true;
} finally {
if (!success) {
ch.close();
}
}
// Bind // Bind
ChannelFuture future = ch.bind(localAddress); ChannelFuture future = ch.bind(localAddress);
@ -288,7 +296,16 @@ public class ConnectionlessBootstrap extends Bootstrap {
// Set the options. // Set the options.
Channel ch = getFactory().newChannel(pipeline); Channel ch = getFactory().newChannel(pipeline);
ch.getConfig().setOptions(getOptions()); boolean success = false;
try {
ch.getConfig().setPipelineFactory(getPipelineFactory());
ch.getConfig().setOptions(getOptions());
success = true;
} finally {
if (!success) {
ch.close();
}
}
// Bind. // Bind.
if (localAddress != null) { if (localAddress != null) {

6
src/main/java/io/netty/bootstrap/ServerBootstrap.java
View File

@ -347,7 +347,11 @@ public class ServerBootstrap extends Bootstrap {
ChannelHandlerContext ctx, ChannelHandlerContext ctx,
ChildChannelStateEvent e) throws Exception { ChildChannelStateEvent e) throws Exception {
// Apply child options. // Apply child options.
e.getChildChannel().getConfig().setOptions(childOptions); try {
e.getChildChannel().getConfig().setOptions(childOptions);
} catch (Throwable t) {
Channels.fireExceptionCaught(e.getChildChannel(), t);
}
ctx.sendUpstream(e); ctx.sendUpstream(e);
} }