From 457384a75cd8fffac66fb9f12d8ab83608c506bb Mon Sep 17 00:00:00 2001 From: Michael Barker Date: Wed, 7 Mar 2018 06:52:02 +1300 Subject: [PATCH] Update for release 3.3.10. --- README.md | 6 +++++- build.gradle | 2 +- .../java/com/lmax/disruptor/BatchEventProcessorTest.java | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7eaf27184..c980a0882 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,13 @@ A High Performance Inter-Thread Messaging Library ## Changelog +### 3.3.10 + +- Fix race condition in BatchEventProcessor between run() and halt(). + ### 3.3.9 -- Changle SleepingWaitStrategy to use a parkNanos(100). +- Change SleepingWaitStrategy to use a parkNanos(100). ### 3.3.8 diff --git a/build.gradle b/build.gradle index f3450e7a3..c746ba1ad 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ apply plugin: 'idea' defaultTasks 'build' group = 'com.lmax' -version = new Version(major: 3, minor: 3, revision: 9) +version = new Version(major: 3, minor: 3, revision: 10) ext { fullName = 'Disruptor Framework' diff --git a/src/test/java/com/lmax/disruptor/BatchEventProcessorTest.java b/src/test/java/com/lmax/disruptor/BatchEventProcessorTest.java index aa8a95419..d52b48afe 100644 --- a/src/test/java/com/lmax/disruptor/BatchEventProcessorTest.java +++ b/src/test/java/com/lmax/disruptor/BatchEventProcessorTest.java @@ -205,7 +205,7 @@ public Object get(long sequence) }; final LatchLifeCycleHandler h1 = new LatchLifeCycleHandler(); - final BatchEventProcessor p1 = new BatchEventProcessor<>(dp, barrier, h1); + final BatchEventProcessor p1 = new BatchEventProcessor(dp, barrier, h1); Thread t1 = new Thread(p1); p1.halt(); @@ -217,7 +217,7 @@ public Object get(long sequence) for (int i = 0; i < 1000; i++) { final LatchLifeCycleHandler h2 = new LatchLifeCycleHandler(); - final BatchEventProcessor p2 = new BatchEventProcessor<>(dp, barrier, h2); + final BatchEventProcessor p2 = new BatchEventProcessor(dp, barrier, h2); Thread t2 = new Thread(p2); t2.start(); p2.halt(); @@ -229,7 +229,7 @@ public Object get(long sequence) for (int i = 0; i < 1000; i++) { final LatchLifeCycleHandler h2 = new LatchLifeCycleHandler(); - final BatchEventProcessor p2 = new BatchEventProcessor<>(dp, barrier, h2); + final BatchEventProcessor p2 = new BatchEventProcessor(dp, barrier, h2); Thread t2 = new Thread(p2); t2.start(); Thread.yield();