[Git][java-team/jboss-xnio][master] 6 commits: Switch to debhelper-compat = 12.
Markus Koschany
gitlab at salsa.debian.org
Sat Jul 20 03:01:41 BST 2019
Markus Koschany pushed to branch master at Debian Java Maintainers / jboss-xnio
Commits:
29297e1b by Markus Koschany at 2019-07-20T01:48:31Z
Switch to debhelper-compat = 12.
- - - - -
b9f3adf4 by Markus Koschany at 2019-07-20T01:48:50Z
Declare compliance with Debian Policy 4.4.0.
- - - - -
93b73392 by Markus Koschany at 2019-07-20T01:49:25Z
Remove get-orig-source target.
- - - - -
6f2f51fc by Markus Koschany at 2019-07-20T01:56:08Z
New upstream version 3.7.2
- - - - -
f453260f by Markus Koschany at 2019-07-20T01:56:23Z
Update upstream source from tag 'upstream/3.7.2'
Update to upstream version '3.7.2'
with Debian dir 7dbb5b104f7db245ce68521c9bea820ea6933fc8
- - - - -
639d9b6f by Markus Koschany at 2019-07-20T01:56:56Z
Update changelog
- - - - -
11 changed files:
- api/pom.xml
- api/src/main/java/org/xnio/FutureResult.java
- api/src/main/java/org/xnio/ssl/JsseSslConduitEngine.java
- debian/changelog
- − debian/compat
- debian/control
- debian/rules
- nio-impl/pom.xml
- nio-impl/src/main/java/org/xnio/nio/QueuedNioTcpServer.java
- nio-impl/src/main/java/org/xnio/nio/WorkerThread.java
- pom.xml
Changes:
=====================================
api/pom.xml
=====================================
@@ -37,7 +37,7 @@
<parent>
<groupId>org.jboss.xnio</groupId>
<artifactId>xnio-all</artifactId>
- <version>3.7.0.Final</version>
+ <version>3.7.2.Final</version>
</parent>
<dependencies>
@@ -175,6 +175,7 @@
</includes>
<enableAssertions>true</enableAssertions>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <argLine>-Djdk.attach.allowAttachSelf</argLine>
</configuration>
</plugin>
<plugin>
@@ -186,7 +187,7 @@
<footer><![CDATA[XNIO API ]]>${project.version}</footer>
<bottom><![CDATA[<i>Copyright © 2017 JBoss, a division of Red Hat, Inc.</i>]]></bottom>
<links>
- <link>http://java.sun.com/javase/8/docs/api/</link>
+ <link>https://docs.oracle.com/javase/8/docs/api/</link>
</links>
</configuration>
</plugin>
=====================================
api/src/main/java/org/xnio/FutureResult.java
=====================================
@@ -36,11 +36,7 @@ public class FutureResult<T> implements Result<T> {
* @param executor the executor to use to execute listener notifiers.
*/
public FutureResult(final Executor executor) {
- ioFuture = new AbstractIoFuture<T>() {
- protected Executor getNotifierExecutor() {
- return executor;
- }
- };
+ ioFuture = new AbstractIoFuture<T>(){};
}
/**
=====================================
api/src/main/java/org/xnio/ssl/JsseSslConduitEngine.java
=====================================
@@ -469,6 +469,10 @@ final class JsseSslConduitEngine {
// given caller is reading, tell it to continue only if we can move away from NEED_WRAP
// and flush any wrapped data we may have left
if (doFlush()) {
+ if (result.getStatus() == SSLEngineResult.Status.CLOSED) {
+ closeOutbound();
+ return false;
+ }
if (!handleWrapResult(result = engineWrap(Buffers.EMPTY_BYTE_BUFFER, buffer), true) || !doFlush()) {
needWrap();
return false;
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+jboss-xnio (3.7.2-1) unstable; urgency=medium
+
+ * New upstream version 3.7.2.
+ * Switch to debhelper-compat = 12.
+ * Declare compliance with Debian Policy 4.4.0.
+ * Remove get-orig-source target.
+
+ -- Markus Koschany <apo at debian.org> Sat, 20 Jul 2019 03:56:36 +0200
+
jboss-xnio (3.7.0-1) unstable; urgency=medium
* New upstream version 3.7.0.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
Uploaders:
Markus Koschany <apo at debian.org>
Build-Depends:
- debhelper (>= 11),
+ debhelper-compat (= 12),
default-jdk-headless (>= 2:1.8),
default-jdk-doc,
junit4,
@@ -20,7 +20,7 @@ Build-Depends:
libwildfly-client-config-java,
libwildfly-common-java,
maven-debian-helper (>= 1.5)
-Standards-Version: 4.3.0
+Standards-Version: 4.4.0
Vcs-Git: https://salsa.debian.org/java-team/jboss-xnio.git
Vcs-Browser: https://salsa.debian.org/java-team/jboss-xnio
Homepage: http://xnio.jboss.org/
=====================================
debian/rules
=====================================
@@ -6,6 +6,3 @@
override_dh_auto_test:
# Do nothing here to prevent a FTBFS due to a bug in maven-compiler-plugin
# 3.2. See also https://bugs.debian.org/808619
-
-get-orig-source:
- uscan --verbose --download-current-version --force-download
=====================================
nio-impl/pom.xml
=====================================
@@ -31,7 +31,7 @@
<parent>
<groupId>org.jboss.xnio</groupId>
<artifactId>xnio-all</artifactId>
- <version>3.7.0.Final</version>
+ <version>3.7.2.Final</version>
</parent>
<properties>
=====================================
nio-impl/src/main/java/org/xnio/nio/QueuedNioTcpServer.java
=====================================
@@ -27,6 +27,7 @@ import java.net.InetSocketAddress;
import java.net.ServerSocket;
import java.net.Socket;
import java.net.SocketAddress;
+import java.nio.channels.ClosedChannelException;
import java.nio.channels.SelectionKey;
import java.nio.channels.ServerSocketChannel;
import java.nio.channels.SocketChannel;
@@ -480,8 +481,11 @@ final class QueuedNioTcpServer extends AbstractNioChannel<QueuedNioTcpServer> im
IoUtils.safeClose(accepted);
return;
}
+ } catch (ClosedChannelException e) {
+ tcpServerLog.logf(FQCN, Logger.Level.DEBUG, e, "ClosedChannelException occurred at accepting request on the server channel %s", channel);
+ return;
} catch (IOException e) {
- tcpServerLog.logf(FQCN, Logger.Level.DEBUG, e, "Exception accepting request, closing server channel %s", this);
+ tcpServerLog.logf(FQCN, Logger.Level.ERROR, e, "Exception accepting request, closing server channel %s", this);
IoUtils.safeClose(channel);
return;
}
=====================================
nio-impl/src/main/java/org/xnio/nio/WorkerThread.java
=====================================
@@ -334,7 +334,7 @@ final class WorkerThread extends XnioIoThread implements XnioExecutor {
}
}
} catch (IOException e) {
- selectorLog.tracef("ConnectHandle.handleReady Exception, " + e);
+ selectorLog.tracef("ConnectHandle.handleReady Exception, %s", e);
futureResult.setException(e);
} finally {
if (!ok) {
@@ -621,7 +621,7 @@ final class WorkerThread extends XnioIoThread implements XnioExecutor {
}
synchronized (workLock) {
selectorWorkQueue.add(command);
- log.tracef("Added task " + command);
+ log.tracef("Added task %s", command);
}
if (polling) { // flag is always false if we're the same thread
selector.wakeup();
=====================================
pom.xml
=====================================
@@ -32,7 +32,7 @@
<artifactId>xnio-all</artifactId>
<packaging>pom</packaging>
<name>XNIO Parent POM</name>
- <version>3.7.0.Final</version>
+ <version>3.7.2.Final</version>
<description>The aggregator POM of the XNIO project</description>
<licenses>
@@ -49,10 +49,10 @@
</modules>
<properties>
- <byteman-version>3.0.3</byteman-version>
- <version.org.jboss.logging.jboss-logging>3.3.1.Final</version.org.jboss.logging.jboss-logging>
- <version.org.jboss.logging.jboss-logging-tools>2.1.0.Final</version.org.jboss.logging.jboss-logging-tools>
- <version.org.jboss.logmanager.jboss-logmanager>2.0.7.Final</version.org.jboss.logmanager.jboss-logmanager>
+ <byteman-version>4.0.6</byteman-version>
+ <version.org.jboss.logging.jboss-logging>3.4.0.Final</version.org.jboss.logging.jboss-logging>
+ <version.org.jboss.logging.jboss-logging-tools>2.2.0.Final</version.org.jboss.logging.jboss-logging-tools>
+ <version.org.jboss.logmanager.jboss-logmanager>2.1.10.Final</version.org.jboss.logmanager.jboss-logmanager>
<version.org.jboss.threads>2.3.0.Beta2</version.org.jboss.threads>
<version.org.wildfly.common>1.3.0.Final</version.org.wildfly.common>
<version.org.wildfly.client-config>1.0.0.Final</version.org.wildfly.client-config>
View it on GitLab: https://salsa.debian.org/java-team/jboss-xnio/compare/15538b16f885ea552a5e43121bebb4a3c2ad6923...639d9b6f51410cf11a29f85dd4a54f2d1db6230e
--
View it on GitLab: https://salsa.debian.org/java-team/jboss-xnio/compare/15538b16f885ea552a5e43121bebb4a3c2ad6923...639d9b6f51410cf11a29f85dd4a54f2d1db6230e
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20190720/def71f4b/attachment.html>
More information about the pkg-java-commits
mailing list