[417844] InvalidationRunner can die if invalidations come too early

https://bugs.eclipse.org/bugs/show_bug.cgi?id=417844

1 files changed, 10 insertions, 16 deletions

diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/QueueWorker.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/QueueWorker.java
index 66b7ef1ef2..d7beedfe4b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/QueueWorker.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/QueueWorker.java
@@ -51,15 +51,12 @@ public abstract class QueueWorker<E> extends Worker
    */
   public void clearQueue()
   {
-    if (queue != null)
-    {
-      queue.clear();
-    }
+    queue.clear();
   }
 
   public boolean addWork(E element)
   {
-    if (queue != null && getLifecycleState() != LifecycleState.DEACTIVATING)
+    if (getLifecycleState() != LifecycleState.DEACTIVATING)
     {
       return queue.offer(element);
     }
@@ -120,20 +117,17 @@ public abstract class QueueWorker<E> extends Worker
   protected void doDeactivate() throws Exception
   {
     super.doDeactivate();
-    if (queue != null)
+    if (doRemainingWorkBeforeDeactivate())
     {
-      if (doRemainingWorkBeforeDeactivate())
-      {
-        WorkContext context = new WorkContext();
-        while (!queue.isEmpty())
-        {
-          doWork(context);
-        }
-      }
-      else
+      WorkContext context = new WorkContext();
+      while (!queue.isEmpty())
       {
-        queue.clear();
+        doWork(context);
       }
     }
+    else
+    {
+      queue.clear();
+    }
   }
 }