honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: fix and simplify logic

This commit is contained in:
Robert Muir 2015-08-21 02:06:34 -04:00
parent d0835715c2
commit a2507a8f1c
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/test/java/org/elasticsearch/common/network/NetworkAddressTests.java
View File

@ -87,21 +87,13 @@ public class NetworkAddressTests extends ESTestCase {
/** creates address without any lookups. hostname can be null, for missing */
private InetAddress forge(String hostname, String address) throws IOException {
if (hostname == null) {
return InetAddress.getByName(address);
} else {
byte bytes[] = InetAddress.getByName(address).getAddress();
return InetAddress.getByAddress(hostname, bytes);
}
byte bytes[] = InetAddress.getByName(address).getAddress();
return InetAddress.getByAddress(hostname, bytes);
}
/** creates scoped ipv6 address without any lookups. hostname can be null, for missing */
private InetAddress forgeScoped(String hostname, String address, int scopeid) throws IOException {
byte bytes[] = InetAddress.getByName(address).getAddress();
if (hostname == null) {
return Inet6Address.getByAddress(hostname, bytes);
} else {
return Inet6Address.getByAddress(hostname, bytes, scopeid);
}
return Inet6Address.getByAddress(hostname, bytes, scopeid);
}
}