aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Becker2013-08-30 12:00:47 (EDT)
committerThomas Becker2013-08-30 12:00:47 (EDT)
commitd51268977b614581bd954852c8505fcad3fee877 (patch)
tree0362ea9d6add4b945315c81a9dadfd2a85858fd7
parentd22fa0dae1cc3d34517bbb4d82ec89bb327fd7a1 (diff)
downloadorg.eclipse.jetty.project-d51268977b614581bd954852c8505fcad3fee877.zip
org.eclipse.jetty.project-d51268977b614581bd954852c8505fcad3fee877.tar.gz
org.eclipse.jetty.project-d51268977b614581bd954852c8505fcad3fee877.tar.bz2
fix merge issue
-rw-r--r--jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
index b89318f..d56fdd3 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
@@ -18,7 +18,9 @@
package org.eclipse.jetty.server;
+import java.io.IOException;
import java.nio.ByteBuffer;
+import java.nio.channels.ClosedChannelException;
import java.util.concurrent.RejectedExecutionException;
import org.eclipse.jetty.http.HttpGenerator;