[netty] 01/02: Update jctools2 patch for approach used upstream
Tony Mancill
tmancill at moszumanska.debian.org
Sun Jul 30 15:59:24 UTC 2017
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository netty.
commit 1049e0079be07cd9f14142cc2289223134e8edd4
Author: tony mancill <tmancill at debian.org>
Date: Sun Jul 30 08:30:32 2017 -0700
Update jctools2 patch for approach used upstream
---
debian/patches/12-jctools2.patch | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/debian/patches/12-jctools2.patch b/debian/patches/12-jctools2.patch
index d47a1f9..82b02f3 100644
--- a/debian/patches/12-jctools2.patch
+++ b/debian/patches/12-jctools2.patch
@@ -4,21 +4,12 @@ Forwarded: not-needed
--- a/common/src/main/java/io/netty/util/internal/PlatformDependent.java
+++ b/common/src/main/java/io/netty/util/internal/PlatformDependent.java
-@@ -21,7 +21,7 @@
- import io.netty.util.internal.logging.InternalLogger;
- import io.netty.util.internal.logging.InternalLoggerFactory;
- import org.jctools.queues.MpscArrayQueue;
--import org.jctools.queues.MpscChunkedArrayQueue;
-+import org.jctools.queues.MpscGrowableArrayQueue;
- import org.jctools.queues.SpscLinkedQueue;
- import org.jctools.queues.atomic.MpscAtomicArrayQueue;
- import org.jctools.queues.atomic.MpscLinkedAtomicQueue;
@@ -835,7 +835,7 @@
// up to the next power of two and so will overflow otherwise.
final int capacity =
Math.max(Math.min(maxCapacity, MAX_ALLOWED_MPSC_CAPACITY), MIN_MAX_MPSC_CAPACITY);
- return new MpscChunkedArrayQueue<T>(MPSC_CHUNK_SIZE, capacity, true);
-+ return new MpscGrowableArrayQueue<T>(MPSC_CHUNK_SIZE, capacity);
++ return new MpscChunkedArrayQueue<T>(MPSC_CHUNK_SIZE, capacity);
} else {
return new MpscLinkedAtomicQueue<T>();
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netty.git
More information about the pkg-java-commits
mailing list