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

Merge remote-tracking branch 'origin/master' into jetty-9.1 

Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
This commit is contained in:
Greg Wilkins 2013-10-28 10:22:16 +11:00
parent 979ddd958b 960c03b8ac
commit 4b87c4683d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -441,12 +441,14 @@ public class HttpOutput extends ServletOutputStream implements Runnable
/* ------------------------------------------------------------ */
/** Blocking send of content.
* @param content The content to send
* @param content The content to send.
* @throws IOException
*/
public void sendContent(ByteBuffer content) throws IOException
{
final BlockingCallback callback =_channel.getWriteBlockingCallback();
if (content.hasArray()&&content.limit()<content.capacity())
content=content.asReadOnlyBuffer();
_channel.write(content,true,callback);
callback.block();
}
@ -488,7 +490,6 @@ public class HttpOutput extends ServletOutputStream implements Runnable
callback.block();
}
/* ------------------------------------------------------------ */
/** Asynchronous send of content.
* @param content The content to send
@ -496,6 +497,8 @@ public class HttpOutput extends ServletOutputStream implements Runnable
*/
public void sendContent(ByteBuffer content, final Callback callback)
{
if (content.hasArray()&&content.limit()<content.capacity())
content=content.asReadOnlyBuffer();
_channel.write(content,true,new Callback()
{
@Override