From c4ad43d0cd116a70f82790af379e5fcbaddf90f0 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Fri, 3 May 2013 19:50:13 +0200 Subject: [PATCH] Removed ugly code that does not seem to be any useful. --- .../org/eclipse/jetty/server/HttpConnection.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 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 bc7ad1b1227..830156c4ad1 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 @@ -223,7 +223,7 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http // Call the channel and this will either handle the request/response to completion OR, // if the request suspends, the request/response will be incomplete so the outer loop will exit. boolean handle=_channel.handle(); - + // Return if suspended or upgraded if (!handle || getEndPoint().getConnection()!=this) return; @@ -270,7 +270,7 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http if (!_channel.getState().isSuspended()) getEndPoint().close(); return; - } + } } } catch (EofException e) @@ -508,13 +508,6 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http getEndPoint().close(); } } - - // make sure that an oshut connection is driven towards close - // TODO this is a little ugly - if (getEndPoint().isOpen() && getEndPoint().isOutputShutdown()) - { - fillInterested(); - } } } @@ -544,7 +537,7 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http // need to call blockForContent again while (event && BufferUtil.hasContent(_requestBuffer) && _parser.inContentState()) _parser.parseNext(_requestBuffer); - + // If we have an event, return if (event) return; @@ -625,7 +618,7 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http */ releaseRequestBuffer(); } - + @Override public String toString() {