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

Fix resource leak in DnsNameResolver

Browse Source
This commit is contained in:
Trustin Lee 2014-10-16 17:56:12 +09:00
parent 0b0544d464
commit c5bbd3c318
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolver.java
View File

@ -751,7 +751,6 @@ public class DnsNameResolver extends SimpleNameResolver<InetSocketAddress> {
private final class DnsResponseHandler extends ChannelInboundHandlerAdapter { private final class DnsResponseHandler extends ChannelInboundHandlerAdapter {
@Override @Override
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception { public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
boolean success = false;
try { try {
final DnsResponse res = (DnsResponse) msg; final DnsResponse res = (DnsResponse) msg;
final int queryId = res.header().id(); final int queryId = res.header().id();
@ -790,8 +789,7 @@ public class DnsNameResolver extends SimpleNameResolver<InetSocketAddress> {
if (res.header().responseCode() == DnsResponseCode.NOERROR) { if (res.header().responseCode() == DnsResponseCode.NOERROR) {
cache(q, res); cache(q, res);
promises.set(queryId, null); promises.set(queryId, null);
qCtx.promise().trySuccess(res); qCtx.promise().trySuccess(res.retain());
success = true;
} else { } else {
qCtx.retry(res.sender(), qCtx.retry(res.sender(),
"response code: " + res.header().responseCode() + "response code: " + res.header().responseCode() +
@ -799,11 +797,9 @@ public class DnsNameResolver extends SimpleNameResolver<InetSocketAddress> {
res.authorityResources().size() + " authority resource(s)"); res.authorityResources().size() + " authority resource(s)");
} }
} finally { } finally {
if (!success) {
ReferenceCountUtil.safeRelease(msg); ReferenceCountUtil.safeRelease(msg);
} }
} }
}
private void cache(DnsQuestion question, DnsResponse res) { private void cache(DnsQuestion question, DnsResponse res) {
final int maxTtl = maxTtl(); final int maxTtl = maxTtl();
@ -823,8 +819,6 @@ public class DnsNameResolver extends SimpleNameResolver<InetSocketAddress> {
// Ensure that the found TTL is between minTtl and maxTtl. // Ensure that the found TTL is between minTtl and maxTtl.
ttl = Math.max(minTtl(), Math.min(maxTtl, ttl)); ttl = Math.max(minTtl(), Math.min(maxTtl, ttl));
res.retain();
DnsNameResolver.this.cache(question, new DnsCacheEntry(res), ttl); DnsNameResolver.this.cache(question, new DnsCacheEntry(res), ttl);
} }
@ -840,7 +834,7 @@ public class DnsNameResolver extends SimpleNameResolver<InetSocketAddress> {
volatile ScheduledFuture<?> expirationFuture; volatile ScheduledFuture<?> expirationFuture;
DnsCacheEntry(DnsResponse response) { DnsCacheEntry(DnsResponse response) {
this.response = response; this.response = response.retain();
cause = null; cause = null;
} }