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

398467 Servlet 3.1 Non Blocking IO 

Fixed handling of empty writes
fixed double close sendContent
This commit is contained in:
Greg Wilkins 2013-05-28 22:46:16 +10:00
parent 2fa50247b7
commit 6f0195e0de
3 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
View File

@ -607,6 +607,7 @@ public class HttpChannel<T> implements HttpParser.RequestHandler<T>, Runnable
protected boolean sendResponse(ResponseInfo info, ByteBuffer content, boolean complete, final Callback callback)
{
// TODO check that complete only set true once by changing _committed to AtomicRef<Enum>
boolean committing = _committed.compareAndSet(false, true);
if (committing)
{

43
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
View File

@ -91,8 +91,20 @@ public class HttpOutput extends ServletOutputStream
*/
void closed()
{
_closed = true;
releaseBuffer();
if (!_closed)
{
_closed = true;
try
{
_channel.getResponse().closeOutput();
}
catch(IOException e)
{
_channel.getEndPoint().shutdownOutput();
LOG.ignore(e);
}
releaseBuffer();
}
}
@Override
@ -197,12 +209,11 @@ public class HttpOutput extends ServletOutputStream
// write any remaining content in the buffer directly
if (len>0)
_channel.write(ByteBuffer.wrap(b, off, len), complete);
else if (complete)
_channel.write(BufferUtil.EMPTY_BUFFER,complete);
if (complete)
{
closed();
_channel.getResponse().closeOutput();
}
}
@ -338,9 +349,23 @@ public class HttpOutput extends ServletOutputStream
* @param content The content to send
* @param callback The callback to use to notify success or failure
*/
public void sendContent(ByteBuffer content, Callback callback)
public void sendContent(ByteBuffer content, final Callback callback)
{
_channel.write(content,true,callback);
_channel.write(content,true,new Callback()
{
@Override
public void succeeded()
{
closed();
callback.succeeded();
}
@Override
public void failed(Throwable x)
{
callback.failed(x);
}
});
}
/* ------------------------------------------------------------ */
@ -377,8 +402,6 @@ public class HttpOutput extends ServletOutputStream
if (_channel.isCommitted())
throw new IOException("committed");
_closed=true;
ByteBuffer buffer= _channel.useDirectBuffers()?httpContent.getDirectBuffer():null;
if (buffer == null)
buffer = httpContent.getIndirectBuffer();
@ -449,6 +472,7 @@ public class HttpOutput extends ServletOutputStream
int len=_in.read(_buffer.array(),0,_buffer.capacity());
if (len==-1)
{
closed();
_channel.getByteBufferPool().release(_buffer);
return true;
}
@ -507,6 +531,7 @@ public class HttpOutput extends ServletOutputStream
int len=_in.read(_buffer);
if (len==-1)
{
closed();
_channel.getByteBufferPool().release(_buffer);
return true;
}

2
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java
View File

@ -179,7 +179,7 @@ public abstract class AbstractCompressedStream extends ServletOutputStream
if (_out == null || _bOut != null)
{
long length=_wrapper.getContentLength();
if (length >= 0 && length < _wrapper.getMinCompressSize())
if (length<0 && _bOut==null || length >= 0 && length < _wrapper.getMinCompressSize())
doNotCompress(false);
else
doCompress();