From 4180db6fae32a68e50183db1b6b4918130453cd0 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Wed, 29 Aug 2012 14:47:15 +0200 Subject: [PATCH] Jetty9 - Removed unnecessary _server field. --- .../java/org/eclipse/jetty/server/HttpConnection.java | 8 +++----- 1 file changed, 3 insertions(+), 5 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 f87d67ab241..2e60a79efcf 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 @@ -51,8 +51,7 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http private final HttpConfiguration _configuration; private final Connector _connector; - private final ByteBufferPool _bufferPool; - private final Server _server; + private final ByteBufferPool _bufferPool; // TODO: remove field, use a _connector.getByteBufferPool() private final HttpGenerator _generator; private final HttpChannelOverHttp _channel; private final HttpParser _parser; @@ -76,9 +75,8 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http _configuration = config; _connector = connector; _bufferPool = _connector.getByteBufferPool(); - _server = connector.getServer(); _generator = new HttpGenerator(); // TODO: consider moving the generator to the transport, where it belongs - _generator.setSendServerVersion(_server.getSendServerVersion()); + _generator.setSendServerVersion(getServer().getSendServerVersion()); _channel = new HttpChannelOverHttp(connector, config, endPoint, this, new Input()); _parser = new HttpParser(_channel,config.getRequestHeaderSize()); @@ -87,7 +85,7 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http public Server getServer() { - return _server; + return _connector.getServer(); } public Connector getConnector()