Fix concurrency issues

fluorumlabs · Oct 18, 2018 · eb3c850 · eb3c850
1 parent d26d70e
commit eb3c850
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -97,7 +97,7 @@ to pool size of 25 threads. You can change that with `AsyncManager.getInstance()
 <dependency>
    <groupId>org.vaadin.helper</groupId>
    <artifactId>async-manager</artifactId>
-   <version>1.0.0-alpha2</version>
+   <version>1.0.0-alpha3</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.vaadin.helper</groupId>
     <artifactId>async-manager</artifactId>
-    <version>1.0.0-alpha2</version>
+    <version>1.0.0-alpha3</version>
     <name>Async Manager</name>
     <description>Async Manager for Vaadin Flow</description>
 

diff --git a/src/main/java/org/vaadin/flow/helper/AsyncTask.java b/src/main/java/org/vaadin/flow/helper/AsyncTask.java
@@ -193,7 +193,7 @@ private void add() {
     /**
      * Remove current task from {@link AsyncManager#asyncTasks} and unregister all listeners
      */
-    private synchronized void remove() {
+    private void remove() {
         if (parentUI != null) {
             asyncManager.removeAsyncTask(parentUI, this);
             // Polling interval needs to be adjusted if task is finished
@@ -205,6 +205,11 @@ private synchronized void remove() {
                     if (uiDetachListenerRegistration != null) uiDetachListenerRegistration.remove();
                     if (pollingListenerRegistration != null) pollingListenerRegistration.remove();
                     if (beforeLeaveListenerRegistration != null) beforeLeaveListenerRegistration.remove();
+
+                    componentDetachListenerRegistration = null;
+                    uiDetachListenerRegistration = null;
+                    pollingListenerRegistration = null;
+                    beforeLeaveListenerRegistration = null;
                 });
             } catch (UIDetachedException ignore) {
                 // ignore detached ui -- there will be no polling events for them anyway