diff options
3 files changed, 4 insertions, 9 deletions
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java index a89d766209..11ca41feb3 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java @@ -18,8 +18,8 @@ package org.eclipse.jetty.io; +import java.nio.channels.SelectableChannel; import java.nio.channels.SelectionKey; -import java.nio.channels.SocketChannel; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; @@ -33,7 +33,7 @@ public class SelectChannelEndPoint extends SocketChannelEndPoint implements Mana { public static final Logger LOG = Log.getLogger(SelectChannelEndPoint.class); - public SelectChannelEndPoint(SocketChannel channel, ManagedSelector selector, SelectionKey key, Scheduler scheduler, long idleTimeout) + public SelectChannelEndPoint(SelectableChannel channel, ManagedSelector selector, SelectionKey key, Scheduler scheduler, long idleTimeout) { super(channel,selector,key,scheduler); setIdleTimeout(idleTimeout); diff --git a/tests/test-loginservice/src/test/java/org/eclipse/jetty/JdbcLoginServiceTest.java b/tests/test-loginservice/src/test/java/org/eclipse/jetty/JdbcLoginServiceTest.java index 6a2f716a97..78aeb6de16 100644 --- a/tests/test-loginservice/src/test/java/org/eclipse/jetty/JdbcLoginServiceTest.java +++ b/tests/test-loginservice/src/test/java/org/eclipse/jetty/JdbcLoginServiceTest.java @@ -216,14 +216,9 @@ public class JdbcLoginServiceTest } } - protected void startClient(String username, String pwd) + protected void startClient(String user, String pwd) throws Exception { - startClient("jetty", "jetty"); - } - - protected void startClient(String user, String pwd) throws Exception - { _client = new HttpClient(); QueuedThreadPool executor = new QueuedThreadPool(); executor.setName(executor.getName() + "-client"); diff --git a/tests/test-sessions/test-file-sessions/pom.xml b/tests/test-sessions/test-file-sessions/pom.xml index f937ef47e9..5c0016d213 100644 --- a/tests/test-sessions/test-file-sessions/pom.xml +++ b/tests/test-sessions/test-file-sessions/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>test-sessions-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.4.0-SNAPSHOT</version> </parent> <artifactId>test-file-sessions</artifactId> <name>Jetty Tests :: Sessions :: File</name> |