Mercurial Hosting > luan

changeset 1036:b87f97f6418a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor
author Franklin Schmidt <fschmidt@gmail.com>
date Thu, 03 Nov 2016 21:42:41 -0600
parents 898774c2cd87
children 3c4c7cc7904f
files src/org/eclipse/jetty/http/AbstractGenerator.java src/org/eclipse/jetty/http/HttpGenerator.java src/org/eclipse/jetty/http/HttpParser.java src/org/eclipse/jetty/server/AbstractHttpConnection.java
diffstat 4 files changed, 12 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
diff -r 898774c2cd87 -r b87f97f6418a src/org/eclipse/jetty/http/AbstractGenerator.java
--- a/src/org/eclipse/jetty/http/AbstractGenerator.java	Thu Nov 03 21:09:57 2016 -0600
+++ b/src/org/eclipse/jetty/http/AbstractGenerator.java	Thu Nov 03 21:42:41 2016 -0600
@@ -129,7 +129,7 @@
 	public final int getContentBufferSize()
 	{
 		if (_buffer==null)
-			_buffer=_buffers.getBuffer();
+			_buffer = _buffers.getBuffer();
 		return _buffer.capacity();
 	}
 
diff -r 898774c2cd87 -r b87f97f6418a src/org/eclipse/jetty/http/HttpGenerator.java
--- a/src/org/eclipse/jetty/http/HttpGenerator.java	Thu Nov 03 21:09:57 2016 -0600
+++ b/src/org/eclipse/jetty/http/HttpGenerator.java	Thu Nov 03 21:42:41 2016 -0600
@@ -154,7 +154,7 @@
 			{
 				if (_bufferChunked)
 				{
-					Buffer nc=_buffers.getBuffer(_content.length()+CHUNK_SPACE+content.length());
+					Buffer nc = _buffers.getBuffer(_content.length()+CHUNK_SPACE+content.length());
 					nc.put(_content);
 					nc.put(HttpTokens.CRLF);
 					BufferUtil.putHexInt(nc, content.length());
@@ -164,7 +164,7 @@
 				}
 				else
 				{
-					Buffer nc=_buffers.getBuffer(_content.length()+content.length());
+					Buffer nc = _buffers.getBuffer(_content.length()+content.length());
 					nc.put(_content);
 					nc.put(content);
 					content=nc;
diff -r 898774c2cd87 -r b87f97f6418a src/org/eclipse/jetty/http/HttpParser.java
--- a/src/org/eclipse/jetty/http/HttpParser.java	Thu Nov 03 21:09:57 2016 -0600
+++ b/src/org/eclipse/jetty/http/HttpParser.java	Thu Nov 03 21:42:41 2016 -0600
@@ -22,8 +22,6 @@
 
 import org.eclipse.jetty.io.Buffer;
 import org.eclipse.jetty.io.BufferUtil;
-import org.eclipse.jetty.io.Buffers;
-import org.eclipse.jetty.io.ByteArrayBuffer;
 import org.eclipse.jetty.io.EndPoint;
 import org.eclipse.jetty.io.EofException;
 import org.eclipse.jetty.io.View;
@@ -211,7 +209,7 @@
 							Buffer chunk = _buffer.get(_buffer.length());
 							_contentPosition += chunk.length();
 							_contentView.update(chunk);
-							_handler.content(chunk); // May recurse here
+							_handler.content(); // May recurse here
 						}
 					}
 
@@ -758,7 +756,7 @@
 						chunk=_buffer.get(_buffer.length());
 						_contentPosition += chunk.length();
 						_contentView.update(chunk);
-						_handler.content(chunk); // May recurse here
+						_handler.content(); // May recurse here
 						// TODO adjust the _buffer to keep unconsumed content
 						return 1;
 
@@ -782,7 +780,7 @@
 						chunk=_buffer.get(length);
 						_contentPosition += chunk.length();
 						_contentView.update(chunk);
-						_handler.content(chunk); // May recurse here
+						_handler.content(); // May recurse here
 
 						if(_contentPosition == _contentLength)
 						{
@@ -874,7 +872,7 @@
 						_contentPosition += chunk.length();
 						_chunkPosition += chunk.length();
 						_contentView.update(chunk);
-						_handler.content(chunk); // May recurse here
+						_handler.content(); // May recurse here
 						// TODO adjust the _buffer to keep unconsumed content
 						return 1;
 					}
@@ -893,7 +891,7 @@
 							while (_buffer.length()>0)
 								if (!Character.isWhitespace(_buffer.get()))
 								{
-									_state=STATE_END;
+									_state = STATE_END;
 									_endp.close();
 									_buffer.clear();
 								}
@@ -1039,7 +1037,7 @@
 
 	public interface EventHandler
 	{
-		public abstract void content(Buffer ref) throws IOException;
+		public abstract void content() throws IOException;
 
 		public void headerComplete() throws IOException;
 
diff -r 898774c2cd87 -r b87f97f6418a src/org/eclipse/jetty/server/AbstractHttpConnection.java
--- a/src/org/eclipse/jetty/server/AbstractHttpConnection.java	Thu Nov 03 21:09:57 2016 -0600
+++ b/src/org/eclipse/jetty/server/AbstractHttpConnection.java	Thu Nov 03 21:42:41 2016 -0600
@@ -637,7 +637,7 @@
 			_delayedHandling = true;
 	}
 
-	private void content(Buffer buffer) throws IOException
+	private void content() throws IOException
 	{
 		if (_delayedHandling)
 		{
@@ -682,9 +682,9 @@
 		}
 
 		@Override
-		public void content(Buffer ref) throws IOException
+		public void content() throws IOException
 		{
-			AbstractHttpConnection.this.content(ref);
+			AbstractHttpConnection.this.content();
 		}
 
 		@Override