Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

jetty-9 recycle response print writers

This commit is contained in:
Greg Wilkins 2012-12-17 15:36:40 +11:00
parent 2966192aa4
commit 3ce8c2ba58
2 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
View File

@ -20,6 +20,7 @@ package org.eclipse.jetty.server;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.Writer;
import java.nio.channels.IllegalSelectorException;
import java.util.ArrayList;
import java.util.Collection;
@ -100,16 +101,17 @@ public class Response implements HttpServletResponse
private String _characterEncoding;
private String _contentType;
private OutputType _outputType = OutputType.NONE;
private PrintWriter _writer;
private ResponseWriter _writer;
private long _contentLength = -1;
public Response(HttpChannel channel, HttpOutput out)
public Response(HttpChannel<?> channel, HttpOutput out)
{
_channel = channel;
_out = out;
}
protected HttpChannel getHttpChannel()
protected HttpChannel<?> getHttpChannel()
{
return _channel;
}
@ -122,7 +124,6 @@ public class Response implements HttpServletResponse
_mimeType = null;
_characterEncoding = null;
_contentType = null;
_writer = null;
_outputType = OutputType.NONE;
_contentLength = -1;
_out.reset();
@ -675,7 +676,7 @@ public class Response implements HttpServletResponse
if (_outputType == OutputType.STREAM)
throw new IllegalStateException("STREAM");
if (_writer == null)
if (_outputType == OutputType.NONE)
{
/* get encoding from Content-Type header */
String encoding = _characterEncoding;
@ -687,17 +688,16 @@ public class Response implements HttpServletResponse
setCharacterEncoding(encoding);
}
if (StringUtil.__ISO_8859_1.equalsIgnoreCase(encoding))
{
_writer = new PrintWriter(new Iso88591HttpWriter(_out));
}
else if (StringUtil.__UTF8.equalsIgnoreCase(encoding))
{
_writer = new PrintWriter(new Utf8HttpWriter(_out));
}
if (_writer != null && _writer.isFor(encoding))
_writer.reopen();
else
{
_writer = new PrintWriter(new EncodingHttpWriter(_out, encoding));
if (StringUtil.__ISO_8859_1.equalsIgnoreCase(encoding))
_writer = new ResponseWriter(new Iso88591HttpWriter(_out),encoding);
else if (StringUtil.__UTF8.equalsIgnoreCase(encoding))
_writer = new ResponseWriter(new Utf8HttpWriter(_out),encoding);
else
_writer = new ResponseWriter(new EncodingHttpWriter(_out, encoding),encoding);
}
// Set the output type at the end, because setCharacterEncoding() checks for it
@ -944,7 +944,6 @@ public class Response implements HttpServletResponse
public void resetForForward()
{
resetBuffer();
_writer = null;
_outputType = OutputType.NONE;
}
@ -1037,4 +1036,29 @@ public class Response implements HttpServletResponse
{
return String.format("%s %d %s%n%s", _channel.getRequest().getHttpVersion(), _status, _reason == null ? "" : _reason, _fields);
}
private static class ResponseWriter extends PrintWriter
{
private final String _encoding;
private final HttpWriter _httpWriter;
public ResponseWriter(HttpWriter httpWriter,String encoding)
{
super(httpWriter);
_httpWriter=httpWriter;
_encoding=encoding;
}
public boolean isFor(String encoding)
{
return _encoding.equalsIgnoreCase(encoding);
}
protected void reopen()
{
super.clearError();
out=_httpWriter;
}
}
}

1
jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
View File

@ -960,6 +960,7 @@ public abstract class HttpServerTestBase extends HttpServerTestFixture
String in = IO.toString(is);
System.err.println(in);
int index = in.indexOf("123456789");
assertTrue(index > 0);