concurrency bug fix

Author: Arik Cohen

Dockerfile

@@ -6,13 +6,9 @@ RUN        apt-get update
 
 RUN        apt-get install -y software-properties-common wget
 
-RUN        add-apt-repository ppa:linuxuprising/java
-
-RUN        echo oracle-java13-installer shared/accepted-oracle-license-v1-2 select true | /usr/bin/debconf-set-selections
-
 RUN        wget https://mediaarea.net/repo/deb/repo-mediaarea_1.0-12_all.deb && dpkg -i repo-mediaarea_1.0-12_all.deb && apt-get update
 
-RUN        apt-get -y install mediainfo wget oracle-java13-installer
+RUN        apt-get -y install mediainfo wget openjdk-11-jdk
 
 RUN        apt-get install -y unzip python
 

pom.xml

@@ -21,7 +21,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>13</java.version>
+		<java.version>11</java.version>
 	</properties>
 
 	<dependencies>

src/main/java/com/creactiviti/piper/core/Worker.java

@@ -106,13 +106,10 @@ public void handle (TaskExecution aTask) {
       }
       catch (Exception e) {
         TaskExecutionFuture<?> myFuture = taskExecutions.get(aTask.getId());
-        if(!myFuture.isCancelled()) {
+        if(myFuture == null || !myFuture.isCancelled()) {
           handleException(aTask, e);
         }
       }
-      finally {
-        taskExecutions.remove(aTask.getId());
-      }
     });
 
     taskExecutions.put(aTask.getId(), new TaskExecutionFuture<>(aTask,future));
@@ -125,6 +122,9 @@ public void handle (TaskExecution aTask) {
     catch (CancellationException e) {
       logger.debug("Cancelled task: {}", aTask.getId());
     }
+    finally {
+      taskExecutions.remove(aTask.getId());
+    }
 
   }