--- a/src/org/eclipse/jetty/server/AbstractHttpConnection.java	Mon Nov 07 22:51:09 2016 -0700
+++ b/src/org/eclipse/jetty/server/AbstractHttpConnection.java	Mon Nov 07 23:15:42 2016 -0700
@@ -40,7 +40,7 @@
 import org.eclipse.jetty.http.HttpVersions;
 import org.eclipse.jetty.http.MimeTypes;
 import org.eclipse.jetty.io.AbstractConnection;
-import org.eclipse.jetty.io.Buffer;
+import org.eclipse.jetty.io.JBuffer;
 import org.eclipse.jetty.io.Buffers;
 import org.eclipse.jetty.io.BufferUtil;
 import org.eclipse.jetty.io.EndPoint;
@@ -704,7 +704,7 @@
 	public final class Output extends ServletOutputStream
 	{
 		private boolean _closed;
-		private Buffer _onebyte;
+		private JBuffer _onebyte;
 		
 		// These are held here for reuse by Writer
 		String _characterEncoding;
@@ -740,7 +740,7 @@
 			write(_onebyte);
 		}
 	
-		private void write(Buffer buffer) throws IOException
+		private void write(JBuffer buffer) throws IOException
 		{
 			if (_closed)
 				throw new IOException("Closed");
@@ -834,7 +834,7 @@
 			try
 			{
 				int max = _generator.prepareUncheckedAddContent();
-				Buffer buffer = _generator.getUncheckedBuffer();
+				JBuffer buffer = _generator.getUncheckedBuffer();
 
 				int len = buffer.readFrom(in,max);
 
@@ -880,7 +880,7 @@
 		public int read(byte[] b, int off, int len) throws IOException
 		{
 			int l = -1;
-			Buffer content = _parser.blockForContent(getMaxIdleTime());
+			JBuffer content = _parser.blockForContent(getMaxIdleTime());
 			if (content!=null)
 				l = content.get(b, off, len);
 			else if (_earlyEOF)