Skip to content

Commit e619b88

Browse files
committed
Backport Netty#5341, close AsyncHttpClient#1175
1 parent 9688a7a commit e619b88

File tree

2 files changed

+41
-0
lines changed

2 files changed

+41
-0
lines changed

netty-bp/resolver/src/main/java/io/netty/resolver/InetSocketAddressResolver.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,9 @@ public void operationComplete(Future<List<InetAddress>> future) throws Exception
8888
}
8989
});
9090
}
91+
92+
@Override
93+
public void close() {
94+
nameResolver.close();
95+
}
9196
}
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/*
2+
* Copyright 2016 The Netty Project
3+
*
4+
* The Netty Project licenses this file to you under the Apache License,
5+
* version 2.0 (the "License"); you may not use this file except in compliance
6+
* with the License. You may obtain a copy of the License at:
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13+
* License for the specific language governing permissions and limitations
14+
* under the License.
15+
*/
16+
package io.netty.resolver;
17+
18+
import io.netty.util.concurrent.ImmediateEventExecutor;
19+
import org.junit.Test;
20+
21+
import java.net.InetAddress;
22+
23+
import static org.mockito.Mockito.*;
24+
25+
public class InetSocketAddressResolverTest {
26+
27+
@Test
28+
public void testCloseDelegates() {
29+
@SuppressWarnings("unchecked")
30+
NameResolver<InetAddress> nameResolver = mock(NameResolver.class);
31+
InetSocketAddressResolver resolver = new InetSocketAddressResolver(
32+
ImmediateEventExecutor.INSTANCE, nameResolver);
33+
resolver.close();
34+
verify(nameResolver, times(1)).close();
35+
}
36+
}

0 commit comments

Comments
 (0)