[205027] Implement challenge/response based negotiator

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

1 files changed, 9 insertions, 1 deletions

diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelector.java
index fe37ae6de1..b6eba61d7e 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelector.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelector.java
@@ -140,6 +140,7 @@ public class TCPSelector extends Lifecycle implements ITCPSelector, Runnable
 
   public void run()
   {
+    selector.wakeup();
     while (running && !Thread.interrupted())
     {
       try
@@ -183,6 +184,10 @@ public class TCPSelector extends Lifecycle implements ITCPSelector, Runnable
           }
         }
       }
+      catch (NullPointerException ex)
+      {
+        break;
+      }
       catch (ClosedSelectorException ex)
       {
         break;
@@ -334,7 +339,10 @@ public class TCPSelector extends Lifecycle implements ITCPSelector, Runnable
     }
 
     pendingOperations.add(operation);
-    selector.wakeup();
+    if (selector != null)
+    {
+      selector.wakeup();
+    }
   }
 
   private void doRegister(final ServerSocketChannel channel, final ITCPSelectorListener.Passive listener)