From 7c0f4848b7eef6ff75e5139f29665340bfe0b75c Mon Sep 17 00:00:00 2001
From: Eike Stepper
Date: Thu, 27 Sep 2007 14:25:55 +0000
Subject: [204795] Provide Net4j Server initialization
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=204795

---
 plugins/org.eclipse.emf.cdo.server/CDOServer.launch     |  2 +-
 .../src/org/eclipse/net4j/internal/tcp/TCPSelector.java | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/plugins/org.eclipse.emf.cdo.server/CDOServer.launch b/plugins/org.eclipse.emf.cdo.server/CDOServer.launch
index 4c422eb544..e86a09a130 100644
--- a/plugins/org.eclipse.emf.cdo.server/CDOServer.launch
+++ b/plugins/org.eclipse.emf.cdo.server/CDOServer.launch
@@ -26,7 +26,7 @@
 <stringAttribute key="product" value="org.eclipse.sdk.ide"/>
 <stringAttribute key="selectedPlugin" value="org.eclipse.net4j.util"/>
 <stringAttribute key="selected_target_plugins" value="javax.servlet,org.eclipse.core.contenttype,org.eclipse.core.jobs,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.equinox.app,org.eclipse.equinox.common,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.osgi,org.eclipse.osgi.services,org.eclipse.osgi.util,org.eclipse.update.configurator"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.protocol,org.eclipse.net4j.util,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.server.db,org.eclipse.net4j.db.derby,org.eclipse.net4j.db,org.eclipse.net4j"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.protocol,org.eclipse.net4j.util,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.server.db,org.eclipse.net4j.db.derby,org.eclipse.net4j.db,org.eclipse.net4j,org.eclipse.net4j.tcp"/>
 <stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
 <booleanAttribute key="tracing" value="true"/>
 <booleanAttribute key="useDefaultConfig" value="true"/>
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 b879091a80..6a69fb68da 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
@@ -209,16 +209,19 @@ public class TCPSelector extends Lifecycle implements ITCPSelector, Runnable
     if (channel instanceof ServerSocketChannel)
     {
       ServerSocketChannel ssChannel = (ServerSocketChannel)selKey.channel();
-      ITCPSelectorListener.Passive listener = (ITCPSelectorListener.Passive)selKey.attachment();
-
-      if (selKey.isAcceptable())
+      if (ssChannel.isOpen())
       {
-        if (TRACER.isEnabled())
+        ITCPSelectorListener.Passive listener = (ITCPSelectorListener.Passive)selKey.attachment();
+
+        if (selKey.isAcceptable())
         {
-          TRACER.trace("Accepting " + ssChannel); //$NON-NLS-1$
-        }
+          if (TRACER.isEnabled())
+          {
+            TRACER.trace("Accepting " + ssChannel); //$NON-NLS-1$
+          }
 
-        listener.handleAccept(this, ssChannel);
+          listener.handleAccept(this, ssChannel);
+        }
       }
     }
     else if (channel instanceof SocketChannel)
-- 
cgit v1.2.3