Markus Koschany pushed to branch upstream at Debian Java Maintainers /
jboss-xnio
Commits:
5d2296aa by Markus Koschany at 2018-05-15T15:21:42+02:00
New upstream version 3.6.3
- - - - -
6 changed files:
- api/pom.xml
- api/src/main/java/org/xnio/XnioIoThread.java
- api/src/main/java/org/xnio/XnioWorker.java
- api/src/main/java/org/xnio/_private/Messages.java
- nio-impl/pom.xml
- pom.xml
Changes:
=====================================
api/pom.xml
=====================================
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -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>
=====================================
api/src/main/java/org/xnio/XnioIoThread.java
=====================================
--- a/api/src/main/java/org/xnio/XnioIoThread.java
+++ b/api/src/main/java/org/xnio/XnioIoThread.java
@@ -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) {
=====================================
api/src/main/java/org/xnio/XnioWorker.java
=====================================
--- a/api/src/main/java/org/xnio/XnioWorker.java
+++ b/api/src/main/java/org/xnio/XnioWorker.java
@@ -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;
=====================================
api/src/main/java/org/xnio/_private/Messages.java
=====================================
--- a/api/src/main/java/org/xnio/_private/Messages.java
+++ b/api/src/main/java/org/xnio/_private/Messages.java
@@ -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")
=====================================
nio-impl/pom.xml
=====================================
--- a/nio-impl/pom.xml
+++ b/nio-impl/pom.xml
@@ -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>
=====================================
pom.xml
=====================================
--- a/pom.xml
+++ b/pom.xml
@@ -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>
View it on GitLab:
https://salsa.debian.org/java-team/jboss-xnio/commit/5d2296aa4bdbd1c88d55eddeca9d9728270ce627
---
View it on GitLab:
https://salsa.debian.org/java-team/jboss-xnio/commit/5d2296aa4bdbd1c88d55eddeca9d9728270ce627
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
pkg-java-commits mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
