From d7c840f19fc28037bd702b2ab57ac982b6a4cdc7 Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Mon, 23 Aug 2010 14:31:56 +0000
Subject: [PATCH] SE-289 fix dss proxy error
SVN: 17586
---
.../cisd/openbis/dss/generic/server/DataStoreServer.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java
index 053a2cb3cc8..6c8468b83f3 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java
@@ -31,8 +31,9 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
+import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.bio.SocketConnector;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.server.ssl.SslSocketConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
@@ -176,7 +177,7 @@ public class DataStoreServer
private static void initializeServer(final ConfigParameters configParameters, final int port,
final Server thisServer)
{
- final SocketConnector socketConnector = createSocketConnector(configParameters);
+ final Connector socketConnector = createSocketConnector(configParameters);
socketConnector.setPort(port);
socketConnector.setMaxIdleTime(30000);
thisServer.addConnector(socketConnector);
@@ -276,7 +277,7 @@ public class DataStoreServer
}
}
- private static SocketConnector createSocketConnector(ConfigParameters configParameters)
+ private static Connector createSocketConnector(ConfigParameters configParameters)
{
if (configParameters.isUseSSL())
{
@@ -288,7 +289,7 @@ public class DataStoreServer
} else
{
operationLog.warn("creating connector to openBIS without SSL");
- return new SocketConnector();
+ return new SelectChannelConnector();
}
}
--
GitLab