Merge branch 'release/v3.0.0-rc.1036.1'

mplatvoet · Feb 5, 2016 · 9d25a66 · 9d25a66
2 parents a4c412d + e7cf842
commit 9d25a66
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ Source and target compatibility is `1.6`
 ###Gradle
 ```groovy
 dependencies {
-    compile 'nl.komponents.kovenant:kovenant:3.0.0-rc.1036'
+    compile 'nl.komponents.kovenant:kovenant:3.0.0-rc.1036.1'
 }
 ```
 
@@ -32,7 +32,7 @@ dependencies {
 <dependency>
 	<groupId>nl.komponents.kovenant</groupId>
 	<artifactId>kovenant</artifactId>
-	<version>3.0.0-rc.1036</version>
+	<version>3.0.0-rc.1036.1</version>
 </dependency>
 ```
 

diff --git a/build.gradle b/build.gradle
@@ -38,7 +38,7 @@ buildscript {
 
 allprojects {
     ext {
-        appVersion = '3.0.0-rc.1036'
+        appVersion = '3.0.0-rc.1036.1'
         appGroup = 'nl.komponents.kovenant'
 
 

diff --git a/docs/docs/changelog.md b/docs/docs/changelog.md
@@ -3,6 +3,13 @@
 Changelog of Kovenant. Complying to [Semantic Versioning](http://semver.org).
 Please refer to [roadmap](roadmap.md) for upcoming releases.
 
+
+##v3.0.0-rc.1036.1
+
+**core**
+
+* [KOV-67](http://issues.komponents.nl/youtrack/issue/KOV-67) Duplicate execution of task on shutdown boundary
+
 ##v3.0.0-rc.1036
 
 **core**

diff --git a/docs/docs/index.md b/docs/docs/index.md
@@ -31,7 +31,7 @@ Source and target compatibility is `1.6`
 ###Gradle
 ```groovy
 dependencies {
-    compile 'nl.komponents.kovenant:kovenant:3.0.0-rc.1036'
+    compile 'nl.komponents.kovenant:kovenant:3.0.0-rc.1036.1'
 }
 ```
 
@@ -40,7 +40,7 @@ dependencies {
 <dependency>
 	<groupId>nl.komponents.kovenant</groupId>
 	<artifactId>kovenant</artifactId>
-	<version>3.0.0-rc.1036</version>
+	<version>3.0.0-rc.1036.1</version>
 </dependency>
 ```
 

diff --git a/projects/core/src/main/kotlin/dispatcher-jvm.kt b/projects/core/src/main/kotlin/dispatcher-jvm.kt
@@ -367,6 +367,12 @@ private class NonBlockingDispatcher(val name: String,
                         // the only state that may keep the thread in interrupted state is when alive == false.
                         // but since we are the last statement the loop is going to end anyway because it checks
                         // whether we're still alive.
+
+                        // KOV-67
+                        //
+                        // null out the poll result. When blocking PollStrategies are it might not get updated with
+                        // a new value
+                        pollResult = null
                     }
                 }
             }