[Git][java-team/jboss-xnio][master] 5 commits: Switch to debhelper-compat = 13.

[Markus Koschany]

Markus Koschany pushed to branch master at Debian Java Maintainers / jboss-xnio


Commits:
4fb69f86 by Markus Koschany at 2020-05-18T22:36:59+02:00
Switch to debhelper-compat = 13.

- - - - -
2ff83656 by Markus Koschany at 2020-05-18T22:37:25+02:00
New upstream version 3.8.1
- - - - -
db290a95 by Markus Koschany at 2020-05-18T22:37:30+02:00
Update upstream source from tag 'upstream/3.8.1'

Update to upstream version '3.8.1'
with Debian dir 0ea59f35259ee394b53500423aaeabd43f132d25
- - - - -
1b19e6fa by Markus Koschany at 2020-05-18T22:37:57+02:00
Update changelog

- - - - -
43d07264 by Markus Koschany at 2020-05-18T22:46:40+02:00
Update copyright years.

- - - - -


7 changed files:

- api/pom.xml
- api/src/main/java/org/xnio/ByteBufferSlicePool.java
- debian/changelog
- debian/control
- debian/copyright
- 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.0.Final</version>
+        <version>3.8.1.Final</version>
     </parent>
 
     <dependencies>


=====================================
api/src/main/java/org/xnio/ByteBufferSlicePool.java
=====================================
@@ -155,11 +155,15 @@ public final class ByteBufferSlicePool implements Pool<ByteBuffer> {
         // only true if using direct allocation
         if (directBuffers != null) {
             ByteBuffer region = FREE_DIRECT_BUFFERS.poll();
-            if (region != null) {
-                return sliceReusedBuffer(region, buffersPerRegion, bufferSize);
+            try {
+                if (region != null) {
+                    return sliceReusedBuffer(region, buffersPerRegion, bufferSize);
+                }
+                region = allocator.allocate(buffersPerRegion * bufferSize);
+                return sliceAllocatedBuffer(region, buffersPerRegion, bufferSize);
+            } finally {
+                directBuffers.add(region);
             }
-            region = allocator.allocate(buffersPerRegion * bufferSize);
-            return sliceAllocatedBuffer(region, buffersPerRegion, bufferSize);
         }
         return sliceAllocatedBuffer(
                 allocator.allocate(buffersPerRegion * bufferSize),
@@ -206,8 +210,11 @@ public final class ByteBufferSlicePool implements Pool<ByteBuffer> {
         if(!sliceQueue.isEmpty()) {
             sliceQueue.clear();
         }
-        // pass everything that is directly allocated to free direct buffers
-        FREE_DIRECT_BUFFERS.addAll(directBuffers);
+        // only true if using direct allocation
+        if (directBuffers != null) {
+            // pass everything that is directly allocated to free direct buffers
+            FREE_DIRECT_BUFFERS.addAll(directBuffers);
+        }
     }
 
     /**


=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+jboss-xnio (3.8.1-1) unstable; urgency=medium
+
+  * New upstream version 3.8.1.
+  * Switch to debhelper-compat = 13.
+
+ -- Markus Koschany <apo at debian.org>  Mon, 18 May 2020 22:37:41 +0200
+
 jboss-xnio (3.8.0-1) unstable; urgency=medium
 
   * New upstream version 3.8.0.


=====================================
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-compat (= 12),
+ debhelper-compat (= 13),
  default-jdk-headless (>= 2:1.8),
  default-jdk-doc,
  junit4,


=====================================
debian/copyright
=====================================
@@ -3,7 +3,7 @@ Upstream-Name: Jboss XNIO
 Source: https://github.com/xnio/xnio
 
 Files: *
-Copyright: 2015-2019, Red Hat, Inc.
+Copyright: 2015-2020, Red Hat, Inc.
 License: Apache-2.0
 
 Files: nio-impl/src/test/java/org/xnio/nio/test/NioHalfDuplexChannelPipeTestCase.java
@@ -17,7 +17,7 @@ Copyright: 2010-2015, Red Hat, Inc
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2015-2019, Markus Koschany <apo at debian.org>
+Copyright: 2015-2020, Markus Koschany <apo at debian.org>
 License: Apache-2.0 or LGPL-2.1+
 
 License: Apache-2.0


=====================================
nio-impl/pom.xml
=====================================
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.jboss.xnio</groupId>
         <artifactId>xnio-all</artifactId>
-        <version>3.8.0.Final</version>
+        <version>3.8.1.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.0.Final</version>
+    <version>3.8.1.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/afe9826d3e3997a7f4e9b2032a9a2e262be1884b...43d072642d601ddf2eebd004444cd7689ad315be

-- 
View it on GitLab: https://salsa.debian.org/java-team/jboss-xnio/-/compare/afe9826d3e3997a7f4e9b2032a9a2e262be1884b...43d072642d601ddf2eebd004444cd7689ad315be
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/20200518/132bc10f/attachment.html>