Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2016-02-04 02:49:47 -0500
committerGreg Wilkins2016-02-04 02:49:47 -0500
commitacde7a7d56f526339ef3976db40ea8e63a194877 (patch)
treeb4e95c5126d3c39b3c9a8dac13152a483e506dff
parentbb89e113a9fdd68bcf4b1c9362e40d370aac5fa6 (diff)
parent2aee8a78932b9b1332f950e8064895638f8d91f4 (diff)
downloadorg.eclipse.jetty.project-acde7a7d56f526339ef3976db40ea8e63a194877.tar.gz
org.eclipse.jetty.project-acde7a7d56f526339ef3976db40ea8e63a194877.tar.xz
org.eclipse.jetty.project-acde7a7d56f526339ef3976db40ea8e63a194877.zip
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
-rw-r--r--jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java4
-rw-r--r--tests/test-loginservice/src/test/java/org/eclipse/jetty/JdbcLoginServiceTest.java7
-rw-r--r--tests/test-sessions/test-file-sessions/pom.xml2
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>

Back to the top