diff options
author | Greg Wilkins | 2011-11-28 23:15:20 +0000 |
---|---|---|
committer | Greg Wilkins | 2011-11-28 23:15:20 +0000 |
commit | dcf7ef233541eb7be3719a94fa9786efcf12af99 (patch) | |
tree | 816b25bf151cc07d55d5f3111d9c785610bfdaf0 | |
parent | 55d5020980aa0b2118f8a3f00e5306bb264fe689 (diff) | |
download | org.eclipse.jetty.project-dcf7ef233541eb7be3719a94fa9786efcf12af99.tar.gz org.eclipse.jetty.project-dcf7ef233541eb7be3719a94fa9786efcf12af99.tar.xz org.eclipse.jetty.project-dcf7ef233541eb7be3719a94fa9786efcf12af99.zip |
fixes after merge
-rw-r--r-- | jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointTest.java | 2 | ||||
-rw-r--r-- | jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointTest.java b/jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointTest.java index 5190935ea3..768f872258 100644 --- a/jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointTest.java +++ b/jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointTest.java @@ -365,7 +365,7 @@ public class SelectChannelEndPointTest // Wait for another idle callback - Thread.sleep(1000); + Thread.sleep(2000); // endpoint is closed. assertFalse(_lastEndp.isOpen()); diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java index fa3b60cb4e..42d080ba7d 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java @@ -53,7 +53,6 @@ import org.eclipse.jetty.security.SecurityHandler; import org.eclipse.jetty.server.AbstractHttpConnection; import org.eclipse.jetty.server.Dispatcher; import org.eclipse.jetty.server.AbstractHttpConnection; -import org.eclipse.jetty.server.DispatcherType; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServletRequestHttpWrapper; |