[462777] Channel not closed after unsuccessful OpenSessionIndication

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

1 files changed, 14 insertions, 1 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenSessionIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenSessionIndication.java
index 7645d24432..b3e28d39ef 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenSessionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenSessionIndication.java
@@ -25,6 +25,7 @@ import org.eclipse.emf.cdo.spi.server.InternalRepository;
 import org.eclipse.emf.cdo.spi.server.InternalSession;
 import org.eclipse.emf.cdo.spi.server.InternalSessionManager;
 
+import org.eclipse.net4j.util.concurrent.ConcurrencyUtil;
 import org.eclipse.net4j.util.om.monitor.OMMonitor;
 import org.eclipse.net4j.util.om.monitor.OMMonitor.Async;
 import org.eclipse.net4j.util.om.trace.ContextTracer;
@@ -118,7 +119,8 @@ public class OpenSessionIndication extends CDOServerIndicationWithMonitoring
 
     try
     {
-      CDOServerProtocol protocol = getProtocol();
+      final CDOServerProtocol protocol = getProtocol();
+
       IRepositoryProvider repositoryProvider = protocol.getRepositoryProvider();
       repository = (InternalRepository)repositoryProvider.getRepository(repositoryName);
       if (repository == null)
@@ -135,6 +137,17 @@ public class OpenSessionIndication extends CDOServerIndicationWithMonitoring
       {
         // Skip response because the user has canceled the authentication
         out.writeInt(0);
+        flush();
+
+        protocol.getExecutorService().submit(new Runnable()
+        {
+          public void run()
+          {
+            ConcurrencyUtil.sleep(500);
+            protocol.getChannel().close();
+          }
+        });
+
         return;
       }