This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository jboss-xnio.
commit 5517d8e54ff1fc95054d7689f2cb031066c321cb Author: Markus Koschany <[email protected]> Date: Sat Aug 19 23:31:42 2017 +0200 Drop no-wildfly-common.patch --- debian/patches/no-wildfly-common.patch | 133 --------------------------------- debian/patches/series | 1 - 2 files changed, 134 deletions(-) diff --git a/debian/patches/no-wildfly-common.patch b/debian/patches/no-wildfly-common.patch deleted file mode 100644 index 8eb8874..0000000 --- a/debian/patches/no-wildfly-common.patch +++ /dev/null @@ -1,133 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Sat, 19 Aug 2017 23:07:19 +0200 -Subject: no wildfly common - -Disable use of wildfly classes that are currently not available in Debian. -This also works around a FTBFS in Option.java. - -Forwarded: not-needed ---- - api/src/main/java/org/xnio/AutomaticReference.java | 2 +- - api/src/main/java/org/xnio/Buffers.java | 10 +++++----- - api/src/main/java/org/xnio/ByteBufferPool.java | 14 +++----------- - api/src/main/java/org/xnio/Option.java | 2 +- - 4 files changed, 10 insertions(+), 18 deletions(-) - -diff --git a/api/src/main/java/org/xnio/AutomaticReference.java b/api/src/main/java/org/xnio/AutomaticReference.java -index 1504c28..548fa4f 100644 ---- a/api/src/main/java/org/xnio/AutomaticReference.java -+++ b/api/src/main/java/org/xnio/AutomaticReference.java -@@ -27,7 +27,7 @@ import java.util.Collections; - import java.util.IdentityHashMap; - import java.util.Set; - --import org.wildfly.common.ref.CleanerReference; -+//import org.wildfly.common.ref.CleanerReference; - - /** - * An automatic reference is a phantom reference which is automatically freed by a background thread when it is -diff --git a/api/src/main/java/org/xnio/Buffers.java b/api/src/main/java/org/xnio/Buffers.java -index ec7099b..2873f16 100644 ---- a/api/src/main/java/org/xnio/Buffers.java -+++ b/api/src/main/java/org/xnio/Buffers.java -@@ -41,9 +41,9 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; - - import static org.xnio._private.Messages.msg; - --import org.wildfly.common.ref.CleanerReference; --import org.wildfly.common.ref.Reaper; --import org.wildfly.common.ref.Reference; -+//import org.wildfly.common.ref.CleanerReference; -+//import org.wildfly.common.ref.Reaper; -+//import org.wildfly.common.ref.Reference; - - /** - * Buffer utility methods. -@@ -1966,12 +1966,12 @@ public final class Buffers { - ByteBuffer oldBuf = this.buf; - if (oldBuf == null) return; - final ByteBuffer buf = oldBuf.duplicate(); -- new CleanerReference<ByteBuffer, Void>(this.buf, null, new Reaper<ByteBuffer, Void>() { -+ /*new CleanerReference<ByteBuffer, Void>(this.buf, null, new Reaper<ByteBuffer, Void>() { - public void reap(final Reference<ByteBuffer, Void> reference) { - // free the duplicate - ByteBufferPool.free(buf); - } -- }); -+ });*/ - this.buf = null; - } - -diff --git a/api/src/main/java/org/xnio/ByteBufferPool.java b/api/src/main/java/org/xnio/ByteBufferPool.java -index 7b7e3f3..3fc34cd 100644 ---- a/api/src/main/java/org/xnio/ByteBufferPool.java -+++ b/api/src/main/java/org/xnio/ByteBufferPool.java -@@ -24,8 +24,6 @@ import java.nio.ByteBuffer; - import java.nio.MappedByteBuffer; - import java.util.concurrent.ConcurrentLinkedQueue; - --import org.wildfly.common.Assert; --import org.wildfly.common.cpu.CacheInfo; - import org.wildfly.common.function.ExceptionBiConsumer; - import org.wildfly.common.function.ExceptionBiFunction; - import org.wildfly.common.function.ExceptionConsumer; -@@ -75,7 +73,7 @@ public abstract class ByteBufferPool { - */ - public static final int SMALL_SIZE = 0x40; - -- static final int CACHE_LINE_SIZE = max(64, CacheInfo.getSmallestDataCacheLineSize()); -+ //static final int CACHE_LINE_SIZE = max(64, CacheInfo.getSmallestDataCacheLineSize()); - - /** - * The large direct buffer pool. This pool produces buffers of {@link #LARGE_SIZE}. -@@ -178,8 +176,6 @@ public abstract class ByteBufferPool { - * @param len the number of buffers to fill in the array - */ - public void allocate(ByteBuffer[] array, int offs, int len) { -- Assert.checkNotNullParam("array", array); -- Assert.checkArrayBounds(array, offs, len); - for (int i = 0; i < len; i ++) { - array[offs + i] = allocate(); - } -@@ -193,7 +189,7 @@ public abstract class ByteBufferPool { - * @param buffer the buffer to free - */ - public static void free(ByteBuffer buffer) { -- Assert.checkNotNullParam("buffer", buffer); -+ //Assert.checkNotNullParam("buffer", buffer); - final int size = buffer.capacity(); - if (Integer.bitCount(size) == 1 && ! buffer.isReadOnly()) { - if (buffer.isDirect()) { -@@ -225,7 +221,7 @@ public abstract class ByteBufferPool { - * @param len the number of buffers to free - */ - public static void free(ByteBuffer[] array, int offs, int len) { -- Assert.checkArrayBounds(array, offs, len); -+ //Assert.checkArrayBounds(array, offs, len); - for (int i = 0; i < len; i ++) { - ByteBuffer buffer = array[offs + i]; - if (buffer == null) { -@@ -532,10 +528,6 @@ public abstract class ByteBufferPool { - final int size = getSize(); - ByteBuffer result = Buffers.slice(parentBuffer, size); - while (parentBuffer.hasRemaining()) { -- // avoid false sharing between buffers -- if (size < CACHE_LINE_SIZE) { -- Buffers.skip(parentBuffer, CACHE_LINE_SIZE - size); -- } - super.doFree(Buffers.slice(parentBuffer, size)); - } - return result; -diff --git a/api/src/main/java/org/xnio/Option.java b/api/src/main/java/org/xnio/Option.java -index 6f54b5e..84ec721 100644 ---- a/api/src/main/java/org/xnio/Option.java -+++ b/api/src/main/java/org/xnio/Option.java -@@ -426,7 +426,7 @@ public abstract class Option<T> implements Serializable { - static <T, E extends Enum<E>> Option.ValueParser<T> getEnumParser(final Class<T> enumType) { - return new ValueParser<T>() { - public T parseValue(final String string, final ClassLoader classLoader) throws IllegalArgumentException { -- return enumType.cast(Enum.<E>valueOf(asEnum(enumType), string.trim())); -+ return null; - } - }; - } diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 80026f8..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -no-wildfly-common.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jboss-xnio.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
