Merge branch 'dev'

Enet4 · Enet4 · commit 0a14f0f96ca8 · 2024-04-24T10:08:28.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,9 +3,13 @@ This document intends to keep track of the changes performed on the various rele
 
 ## 3.3
 
+### 3.3.6 (2024-04-24)
+
+- Fix application of task cleaning hook in `RunningIndexTasks` (#687)
+
 ### 3.3.5 (2024-02-28)
 
-- Change DICOM storage stop behavior to soft stop by (#684)
+- Change DICOM storage stop behavior to soft stop (#684)
 
 ### 3.3.4 (2023-12-15)
 
diff --git a/dicoogle/pom.xml b/dicoogle/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>pt.ua.ieeta</groupId>
         <artifactId>dicoogle-all</artifactId>
-        <version>3.3.5</version>
+        <version>3.3.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/dicoogle/src/main/java/pt/ua/dicoogle/taskManager/RunningIndexTasks.java b/dicoogle/src/main/java/pt/ua/dicoogle/taskManager/RunningIndexTasks.java
@@ -74,7 +74,7 @@ public void addTask(String taskUid, Task<Report> task) {
     }
 
     public void addTask(Task<Report> task) {
-        taskRunningList.put(task.getUid(), task);
+        this.addTask(task.getUid(), task);
     }
 
     public boolean removeTask(String taskUid) {
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>pt.ua.ieeta</groupId>
     <artifactId>dicoogle-all</artifactId>
-    <version>3.3.5</version>
+    <version>3.3.6</version>
     <packaging>pom</packaging>
     <name>dicoogle-all</name>
 
diff --git a/sdk/pom.xml b/sdk/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>pt.ua.ieeta</groupId>
         <artifactId>dicoogle-all</artifactId>
-        <version>3.3.5</version>
+        <version>3.3.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public void addTask(String taskUid, Task<Report> task) {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`public void addTask(Task<Report> task) {`
`77`		`- taskRunningList.put(task.getUid(), task);`
	`77`	`+ this.addTask(task.getUid(), task);`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`public boolean removeTask(String taskUid) {`