--- a/src/org/eclipse/jetty/server/Connector.java	Mon Nov 07 22:51:09 2016 -0700
+++ b/src/org/eclipse/jetty/server/Connector.java	Mon Nov 07 23:15:42 2016 -0700
@@ -28,7 +28,7 @@
 
 import javax.servlet.ServletRequest;
 
-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;
@@ -43,7 +43,7 @@
  * <ul>
  * <li>AbstractLifeCycle implementation</li>
  * <li>Implementations for connector getters and setters</li>
- * <li>Buffer management</li>
+ * <li>JBuffer management</li>
  * <li>Socket configuration</li>
  * <li>Base acceptor thread</li>
  * <li>Optional reverse proxy headers checking</li>
@@ -251,7 +251,7 @@
 
 	// my own buffers
 
-	protected Buffer newBuffer(int size) {
+	protected JBuffer newBuffer(int size) {
 		return BufferUtil.newDirectBuffer(size);
 	}
 
@@ -265,17 +265,17 @@
 		}
 
 		@Override
-		public Buffer getHeader() {
+		public JBuffer getHeader() {
 			return BufferUtil.newBuffer(headerSize);
 		}
 
 		@Override
-		public Buffer getBuffer() {
+		public JBuffer getBuffer() {
 			return newBuffer(bufferSize);
 		}
 
 		@Override
-		public Buffer getBuffer(int size) {
+		public JBuffer getBuffer(int size) {
 			return newBuffer(size);
 		}
 	}