This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository openhft-chronicle-queue.
commit bf11e3825d67d248067865685ff4d886f466fe8a Author: Emmanuel Bourg <[email protected]> Date: Wed Aug 3 11:54:51 2016 +0200 Replaced the koloboke map in WireStorePool with a standard class --- debian/changelog | 1 + debian/maven.ignoreRules | 2 ++ debian/patches/02-ignore-koloboke.patch | 19 +++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 23 insertions(+) diff --git a/debian/changelog b/debian/changelog index df571ab..06649e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ openhft-chronicle-queue (3.6.0-1) UNRELEASED; urgency=medium * New upstream release - Ignore the new chronicle-test module - Depend on libopenhft-lang-java (>= 6.6.2) + - Replaced the koloboke map in WireStorePool with a standard class * Depend on libintellij-annotations-java instead of injecting the annotations * Build with the DH sequencer instead of CDBS * Updated debian/watch to track the 4.x releases diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 6e290a6..4c97a6f 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -7,6 +7,8 @@ junit junit * * * * net.java.dev.jna jna * * * * net.java.dev.jna platform * * * * net.openhft affinity * * * * +net.openhft koloboke-api-jdk8 * * * * +net.openhft koloboke-impl-jdk8 * * * * net.sf.trove4j trove4j * * * * org.apache.felix org.apache.felix.framework * * * * org.apache.maven.plugins maven-javadoc-plugin * * * * diff --git a/debian/patches/02-ignore-koloboke.patch b/debian/patches/02-ignore-koloboke.patch new file mode 100644 index 0000000..7b8cc28 --- /dev/null +++ b/debian/patches/02-ignore-koloboke.patch @@ -0,0 +1,19 @@ +--- a/chronicle-queue/src/main/java/net/openhft/chronicle/queue/impl/WireStorePool.java ++++ b/chronicle-queue/src/main/java/net/openhft/chronicle/queue/impl/WireStorePool.java +@@ -15,7 +15,6 @@ + */ + package net.openhft.chronicle.queue.impl; + +-import net.openhft.koloboke.collect.map.hash.HashLongObjMaps; + import org.jetbrains.annotations.NotNull; + + import java.io.IOException; +@@ -27,7 +26,7 @@ + + public WireStorePool(@NotNull WireStoreSupplier supplier) { + this.supplier = supplier; +- this.stores = HashLongObjMaps.newMutableMap(); ++ this.stores = new java.util.HashMap(); + } + + public synchronized WireStore acquire(long cycle) throws IOException { diff --git a/debian/patches/series b/debian/patches/series index e69de29..fad2646 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +02-ignore-koloboke.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openhft-chronicle-queue.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
