[417825] Invalidator can die if CDOSession can not be activated within

100ms 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=417825

1 files changed, 2 insertions, 18 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 6aa5dc3b62..66b7ef1ef2 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
@@ -27,7 +27,7 @@ public abstract class QueueWorker<E> extends Worker
    */
   public static final int DEFAULT_POLL_MILLIS = 100;
 
-  private BlockingQueue<E> queue;
+  private BlockingQueue<E> queue = createQueue();
 
   private long pollMillis;
 
@@ -70,14 +70,7 @@ public abstract class QueueWorker<E> extends Worker
   @Override
   protected void work(WorkContext context) throws Exception
   {
-    if (queue == null)
-    {
-      context.terminate();
-    }
-    else
-    {
-      doWork(context);
-    }
+    doWork(context);
   }
 
   private void doWork(WorkContext context) throws InterruptedException
@@ -124,13 +117,6 @@ public abstract class QueueWorker<E> extends Worker
   }
 
   @Override
-  protected void doActivate() throws Exception
-  {
-    queue = createQueue();
-    super.doActivate();
-  }
-
-  @Override
   protected void doDeactivate() throws Exception
   {
     super.doDeactivate();
@@ -148,8 +134,6 @@ public abstract class QueueWorker<E> extends Worker
       {
         queue.clear();
       }
-
-      queue = null;
     }
   }
 }