From 2e02f153ce316f17cb00800065860618173c21eb Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Fri, 21 Sep 2012 15:07:36 +0200 Subject: [PATCH] jetty-9: Cosmetics. --- .../main/java/org/eclipse/jetty/server/HttpConnection.java | 4 ++-- .../src/main/java/org/eclipse/jetty/server/Response.java | 4 ++-- 2 files changed, 4 insertions(+), 4 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 f3951933e7f..23a7a895776 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 @@ -277,12 +277,12 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http LOG.debug(e); else LOG.warn(this.toString(), e); - getEndPoint().close(); + close(); } catch (Exception e) { LOG.warn(this.toString(), e); - getEndPoint().close(); + close(); } finally { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java index d145e2173ad..ee666387f80 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java @@ -25,7 +25,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Locale; import java.util.concurrent.atomic.AtomicInteger; - import javax.servlet.RequestDispatcher; import javax.servlet.ServletOutputStream; import javax.servlet.http.Cookie; @@ -43,6 +42,7 @@ import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http.HttpURI; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.http.MimeTypes; +import org.eclipse.jetty.io.RuntimeIOException; import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.server.handler.ErrorHandler; import org.eclipse.jetty.util.ByteArrayISO8859Writer; @@ -722,7 +722,7 @@ public class Response implements HttpServletResponse } catch (IOException e) { - throw new RuntimeException(e); + throw new RuntimeIOException(e); } return true; }