Skip to content
Commits on Source (5)
......@@ -37,7 +37,7 @@
<parent>
<groupId>org.jboss.xnio</groupId>
<artifactId>xnio-all</artifactId>
<version>3.6.2.Final</version>
<version>3.6.3.Final</version>
</parent>
<dependencies>
......
......@@ -243,8 +243,15 @@ public abstract class XnioIoThread extends Thread implements XnioExecutor, XnioI
}
private IoFuture<StreamConnection> internalOpenTcpStreamConnection(InetSocketAddress destination, ChannelListener<? super StreamConnection> openListener, ChannelListener<? super BoundChannel> bindListener, OptionMap optionMap) {
InetSocketAddress bindAddress = getWorker().getBindAddressTable().get(((InetSocketAddress)destination).getAddress());
return openTcpStreamConnection(bindAddress == null ? Xnio.ANY_INET_ADDRESS : bindAddress, (InetSocketAddress) destination, openListener, bindListener, optionMap);
if (destination.isUnresolved()) {
try {
destination = new InetSocketAddress(InetAddress.getByName(destination.getHostString()), destination.getPort());
} catch (UnknownHostException e) {
return new FailedIoFuture<>(e);
}
}
InetSocketAddress bindAddress = getWorker().getBindAddressTable().get(destination.getAddress());
return openTcpStreamConnection(bindAddress == null ? Xnio.ANY_INET_ADDRESS : bindAddress, destination, openListener, bindListener, optionMap);
}
public IoFuture<StreamConnection> openStreamConnection(SocketAddress bindAddress, SocketAddress destination, ChannelListener<? super StreamConnection> openListener, ChannelListener<? super BoundChannel> bindListener, OptionMap optionMap) {
......
......@@ -1056,8 +1056,12 @@ public abstract class XnioWorker extends AbstractExecutorService implements Conf
}
public Builder addBindAddressConfiguration(CidrAddress cidrAddress, InetSocketAddress bindAddress) {
if (cidrAddress.getNetworkAddress().getClass() != bindAddress.getAddress().getClass()) {
throw Messages.msg.mismatchAddressType(cidrAddress.getNetworkAddress().getClass(), bindAddress.getAddress().getClass());
final Class<? extends InetAddress> networkAddrClass = cidrAddress.getNetworkAddress().getClass();
if (bindAddress.isUnresolved()) {
throw Messages.msg.addressUnresolved(bindAddress);
}
if (networkAddrClass != bindAddress.getAddress().getClass()) {
throw Messages.msg.mismatchAddressType(networkAddrClass, bindAddress.getAddress().getClass());
}
bindAddressConfigurations.put(cidrAddress, bindAddress);
return this;
......
......@@ -23,6 +23,7 @@ import java.io.EOFException;
import java.io.IOException;
import java.io.InterruptedIOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.nio.BufferOverflowException;
import java.nio.BufferUnderflowException;
......@@ -197,6 +198,9 @@ public interface Messages extends BasicLogger {
@Message(id = 41, value = "'%s' is not a valid Strength value")
IllegalArgumentException invalidStrength(String name);
@Message(id = 42, value = "Cannot add unresolved address '%s'")
IllegalArgumentException addressUnresolved(InetSocketAddress bindAddress);
// HTTP upgrade
@Message(id = 100, value = "'https' URL scheme chosen but no SSL provider given")
......
jboss-xnio (3.6.2-3) UNRELEASED; urgency=medium
jboss-xnio (3.6.3-1) UNRELEASED; urgency=medium
*
* New upstream version 3.6.3.
* Declare compliance with Debian Policy 4.1.4.
-- Markus Koschany <apo@debian.org> Sun, 25 Mar 2018 18:24:07 +0200
-- Markus Koschany <apo@debian.org> Tue, 15 May 2018 15:21:59 +0200
jboss-xnio (3.6.2-2) unstable; urgency=medium
......
......@@ -20,7 +20,7 @@ Build-Depends:
libwildfly-client-config-java,
libwildfly-common-java,
maven-debian-helper (>= 1.5)
Standards-Version: 4.1.3
Standards-Version: 4.1.4
Vcs-Git: https://anonscm.debian.org/git/pkg-java/jboss-xnio.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jboss-xnio.git
Homepage: http://xnio.jboss.org/
......
......@@ -31,7 +31,7 @@
<parent>
<groupId>org.jboss.xnio</groupId>
<artifactId>xnio-all</artifactId>
<version>3.6.2.Final</version>
<version>3.6.3.Final</version>
</parent>
<properties>
......
......@@ -32,7 +32,7 @@
<artifactId>xnio-all</artifactId>
<packaging>pom</packaging>
<name>XNIO Parent POM</name>
<version>3.6.2.Final</version>
<version>3.6.3.Final</version>
<description>The aggregator POM of the XNIO project</description>
<licenses>
......