[Git][java-team/jboss-xnio][master] 4 commits: New upstream version 3.8.8
Markus Koschany (@apo)
gitlab at salsa.debian.org
Thu Sep 22 22:17:51 BST 2022
Markus Koschany pushed to branch master at Debian Java Maintainers / jboss-xnio
Commits:
458573dc by Markus Koschany at 2022-09-22T23:12:01+02:00
New upstream version 3.8.8
- - - - -
c8e2232f by Markus Koschany at 2022-09-22T23:12:03+02:00
Update upstream source from tag 'upstream/3.8.8'
Update to upstream version '3.8.8'
with Debian dir 189708d6a9af533928052b408d223c468d885760
- - - - -
5e3c2714 by Markus Koschany at 2022-09-22T23:12:22+02:00
Update changelog
- - - - -
5a1c5b4e by Markus Koschany at 2022-09-22T23:13:15+02:00
Drop CVE-2022-0084.patch. Fixed upstream.
- - - - -
8 changed files:
- api/pom.xml
- api/src/main/java/org/xnio/StreamConnection.java
- api/src/main/java/org/xnio/_private/Messages.java
- debian/changelog
- − debian/patches/CVE-2022-0084.patch
- − debian/patches/series
- nio-impl/pom.xml
- pom.xml
Changes:
=====================================
api/pom.xml
=====================================
@@ -37,7 +37,7 @@
<parent>
<groupId>org.jboss.xnio</groupId>
<artifactId>xnio-all</artifactId>
- <version>3.8.7.Final</version>
+ <version>3.8.8.Final</version>
</parent>
<dependencies>
=====================================
api/src/main/java/org/xnio/StreamConnection.java
=====================================
@@ -21,6 +21,7 @@ package org.xnio;
import java.io.IOException;
import java.util.concurrent.atomic.AtomicReference;
+import org.jboss.logging.Logger;
import org.xnio.channels.CloseListenerSettable;
import org.xnio.conduits.ConduitStreamSinkChannel;
import org.xnio.conduits.ConduitStreamSourceChannel;
@@ -41,6 +42,7 @@ public abstract class StreamConnection extends Connection implements CloseListen
* An empty listener used as a flag, to indicate that close listener has been invoked.
*/
private static final ChannelListener<? super StreamConnection> INVOKED_CLOSE_LISTENER_FLAG = (StreamConnection connection)->{};
+ private static final Logger log = Logger.getLogger("org.xnio.StreamConnection");
private ConduitStreamSourceChannel sourceChannel;
private ConduitStreamSinkChannel sinkChannel;
@@ -86,7 +88,7 @@ public abstract class StreamConnection extends Connection implements CloseListen
try {
this.getSourceChannel().shutdownReads();
} catch (IOException e) {
- e.printStackTrace();
+ msg.connectionNotifyReadClosedFailed(e, this);
}
}
@@ -94,7 +96,7 @@ public abstract class StreamConnection extends Connection implements CloseListen
try {
this.getSinkChannel().shutdownWrites();
} catch (IOException e) {
- e.printStackTrace();
+ msg.connectionNotifyWriteClosedFailed(e, this);
}
}
=====================================
api/src/main/java/org/xnio/_private/Messages.java
=====================================
@@ -43,6 +43,7 @@ import org.jboss.logging.annotations.LogMessage;
import org.jboss.logging.annotations.Message;
import org.jboss.logging.annotations.MessageLogger;
import org.xnio.IoFuture;
+import org.xnio.StreamConnection;
import org.xnio.channels.AcceptingChannel;
import org.xnio.channels.ConcurrentStreamChannelAccessException;
import org.xnio.channels.ConnectedChannel;
@@ -361,4 +362,12 @@ public interface Messages extends BasicLogger {
@Message(value = "Expanded buffer enabled due to overflow with empty buffer, expanded buffer size is %s")
@LogMessage(level = TRACE)
void expandedSslBufferEnabled(int bufferSize);
+
+ @Message(value = "Notify read closed for connection %s failed")
+ @LogMessage(level = TRACE)
+ void connectionNotifyReadClosedFailed(@Cause Throwable cause, StreamConnection connection);
+
+ @Message(value = "Notify write closed for connection %s failed")
+ @LogMessage(level = TRACE)
+ void connectionNotifyWriteClosedFailed(@Cause Throwable cause, StreamConnection connection);
}
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+jboss-xnio (3.8.8-1) unstable; urgency=medium
+
+ * New upstream version 3.8.8.
+ * Drop CVE-2022-0084.patch. Fixed upstream.
+
+ -- Markus Koschany <apo at debian.org> Thu, 22 Sep 2022 23:12:12 +0200
+
jboss-xnio (3.8.7-2) unstable; urgency=medium
* Fix CVE-2022-0084.
=====================================
debian/patches/CVE-2022-0084.patch deleted
=====================================
@@ -1,48 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Tue, 23 Aug 2022 13:15:04 +0200
-Subject: CVE-2022-0084
-
-Bug-Debian: https://bugs.debian.org/1013280
-Origin: https://github.com/xnio/xnio/commit/b05531de0433f498af26f9aec6c0e944c3c1689c
----
- api/src/main/java/org/xnio/StreamConnection.java | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/api/src/main/java/org/xnio/StreamConnection.java b/api/src/main/java/org/xnio/StreamConnection.java
-index 807142f..e0b9fb6 100644
---- a/api/src/main/java/org/xnio/StreamConnection.java
-+++ b/api/src/main/java/org/xnio/StreamConnection.java
-@@ -21,6 +21,7 @@ package org.xnio;
- import java.io.IOException;
- import java.util.concurrent.atomic.AtomicReference;
-
-+import org.jboss.logging.Logger;
- import org.xnio.channels.CloseListenerSettable;
- import org.xnio.conduits.ConduitStreamSinkChannel;
- import org.xnio.conduits.ConduitStreamSourceChannel;
-@@ -41,6 +42,7 @@ public abstract class StreamConnection extends Connection implements CloseListen
- * An empty listener used as a flag, to indicate that close listener has been invoked.
- */
- private static final ChannelListener<? super StreamConnection> INVOKED_CLOSE_LISTENER_FLAG = (StreamConnection connection)->{};
-+ private static final Logger log = Logger.getLogger("org.xnio.StreamConnection");
-
- private ConduitStreamSourceChannel sourceChannel;
- private ConduitStreamSinkChannel sinkChannel;
-@@ -86,7 +88,7 @@ public abstract class StreamConnection extends Connection implements CloseListen
- try {
- this.getSourceChannel().shutdownReads();
- } catch (IOException e) {
-- e.printStackTrace();
-+ log.error("Error in read close", e);
- }
- }
-
-@@ -94,7 +96,7 @@ public abstract class StreamConnection extends Connection implements CloseListen
- try {
- this.getSinkChannel().shutdownWrites();
- } catch (IOException e) {
-- e.printStackTrace();
-+ log.error("Error in write close", e);
- }
- }
-
=====================================
debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-CVE-2022-0084.patch
=====================================
nio-impl/pom.xml
=====================================
@@ -31,7 +31,7 @@
<parent>
<groupId>org.jboss.xnio</groupId>
<artifactId>xnio-all</artifactId>
- <version>3.8.7.Final</version>
+ <version>3.8.8.Final</version>
</parent>
<properties>
=====================================
pom.xml
=====================================
@@ -32,7 +32,7 @@
<artifactId>xnio-all</artifactId>
<packaging>pom</packaging>
<name>XNIO Parent POM</name>
- <version>3.8.7.Final</version>
+ <version>3.8.8.Final</version>
<description>The aggregator POM of the XNIO project</description>
<licenses>
View it on GitLab: https://salsa.debian.org/java-team/jboss-xnio/-/compare/ede52e4871fb0b55fe38aa2437fc27102c1fae8f...5a1c5b4ee7d5fdb9ff6f173487f3e35a2706aba8
--
View it on GitLab: https://salsa.debian.org/java-team/jboss-xnio/-/compare/ede52e4871fb0b55fe38aa2437fc27102c1fae8f...5a1c5b4ee7d5fdb9ff6f173487f3e35a2706aba8
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/20220922/e8f77821/attachment.htm>
More information about the pkg-java-commits
mailing list