Fix concurrency issue in AsyncCompletions; fix hashCodes in ReferenceTypes; prepare next build

Author: vsilaev

README.md

@@ -1,4 +1,4 @@
-[![Maven Central](https://img.shields.io/maven-central/v/net.tascalate/net.tascalate.concurrent.svg)](https://search.maven.org/artifact/net.tascalate/net.tascalate.concurrent/0.9.9/jar) [![GitHub release](https://img.shields.io/github/release/vsilaev/tascalate-concurrent.svg)](https://github.com/vsilaev/tascalate-concurrent/releases/tag/0.9.9) [![license](https://img.shields.io/github/license/vsilaev/tascalate-concurrent.svg)](http://www.apache.org/licenses/LICENSE-2.0.txt)
+[![Maven Central](https://img.shields.io/maven-central/v/net.tascalate/net.tascalate.concurrent.svg)](https://search.maven.org/artifact/net.tascalate/net.tascalate.concurrent/0.9.10/jar) [![GitHub release](https://img.shields.io/github/release/vsilaev/tascalate-concurrent.svg)](https://github.com/vsilaev/tascalate-concurrent/releases/tag/0.9.10) [![license](https://img.shields.io/github/license/vsilaev/tascalate-concurrent.svg)](http://www.apache.org/licenses/LICENSE-2.0.txt)
 # tascalate-concurrent
 The library provides an implementation of the [CompletionStage](https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletionStage.html) interface and related classes these are designed to support long-running blocking tasks (typically, I/O bound). This functionality augments the sole Java 8 built-in implementation, [CompletableFuture](https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html), that is primarily supports computational tasks. Also, the library helps with numerous asynchronous programing challenges like handling timeouts, retry/poll functionality, orchestrating results of multiple concurrent computations and similar.
 
@@ -12,7 +12,7 @@ New name:
 <dependency>
     <groupId>net.tascalate</groupId>
     <artifactId>net.tascalate.concurrent</artifactId>
-    <version>0.9.9</version> <!-- Any version above 0.8.0, the latest one is recommended -->
+    <version>0.9.10</version> <!-- Any version above 0.8.0, the latest one is recommended -->
 </dependency>
 ```
 Old Name
@@ -38,7 +38,7 @@ To use a library you have to add a single Maven dependency
 <dependency>
     <groupId>net.tascalate</groupId>
     <artifactId>net.tascalate.concurrent</artifactId>
-    <version>0.9.9</version>
+    <version>0.9.10</version>
 </dependency>
 ```
 

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>net.tascalate</groupId>
 	<artifactId>net.tascalate.concurrent</artifactId>
-	<version>0.9.9</version>
+	<version>0.9.10</version>
 	<packaging>jar</packaging>  
 
 	<name>Tascalate Concurrent</name>

src/main/java/net/tascalate/concurrent/AsyncCompletions.java

@@ -114,15 +114,20 @@ public T next() {
             } else {
                 if (!settledResults.isEmpty()) {
                     // There are some resolved results available
-                    return settledResults.poll().done(); 
+                    Try<T> settledResult = settledResults.poll();
+                    inProgress.decrementAndGet();
+                    return settledResult.done(); 
                 } else {
                     if (unprocessed > 0) {
-                        // If we are still producing then await for any result...  
+                        // If we are still producing then await for any result...
+                        Try<T> settledResult;
                         try {
-                            return settledResults.take().done();
+                            settledResult = settledResults.take();
                         } catch (InterruptedException ex) {
                             throw new NoSuchElementException(ex.getMessage());
                         }
+                        inProgress.decrementAndGet();
+                        return settledResult.done();
                     } else {
                         if (enlistPending()) {
                             // More was enlisted
@@ -221,23 +226,18 @@ private boolean enlistPending() {
     }
 
     private BiConsumer<T, Throwable> enlistResolved(CompletionStage<? extends T> promise) {
-        return (v, ex) -> {
+        return (resolvedValue, ex) -> {
             enlistedPromises.remove(promise);
-            enlistResolved(v, ex);
-        };
-    }
-    
-    private void enlistResolved(T resolvedValue, Throwable ex) {
-        try {
-            if (ex == null) {
-                settledResults.put(Try.success(resolvedValue));
-            } else {
-                settledResults.put(Try.failure(ex));
+            try {
+                if (ex == null) {
+                    settledResults.put(Try.success(resolvedValue));
+                } else {
+                    settledResults.put(Try.failure(ex));
+                }
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e); // Shouldn't happen for the queue with an unlimited size
             }
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e); // Shouldn't happen for the queue with an unlimited size
-        }
-        inProgress.decrementAndGet();
+        };
     }
 
 }

src/main/java/net/tascalate/concurrent/core/ReferenceType.java

@@ -94,7 +94,7 @@ static final class LookupKey<K> {
 
         LookupKey(K key) {
             this.key = key;
-            this.hashCode = System.identityHashCode(key);
+            this.hashCode = key == null ? 0 : key.hashCode();
         }
 
         @Override
@@ -118,7 +118,7 @@ static final class WeakKey<K> extends WeakReference<K> {
 
         WeakKey(K key, ReferenceQueue<? super K> queue) {
             super(key, queue);
-            hashCode = System.identityHashCode(key);
+            hashCode = key == null ? 0 : key.hashCode();
         }
 
         @Override
@@ -147,7 +147,7 @@ static final class SoftKey<K> extends SoftReference<K> {
 
         SoftKey(K key, ReferenceQueue<? super K> queue) {
             super(key, queue);
-            hashCode = System.identityHashCode(key);
+            hashCode = key == null ? 0 : key.hashCode();
         }
 
         @Override