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

Code cleanups.

This commit is contained in:
Simone Bordet 2016-10-05 09:15:33 +02:00
parent 4eca898ab0
commit 85f50da053
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jetty-http/src/main/java/org/eclipse/jetty/http/GZIPContentDecoder.java
View File

@ -28,9 +28,9 @@ import org.eclipse.jetty.util.BufferUtil;
/** /**
* Decoder for the "gzip" encoding. * Decoder for the "gzip" encoding.
* <p>An Decode that inflates gzip compressed data that has been * <p>
* A decoder that inflates gzip compressed data that has been
* optimized for async usage with minimal data copies. * optimized for async usage with minimal data copies.
*
*/ */
public class GZIPContentDecoder public class GZIPContentDecoder
{ {
@ -91,7 +91,9 @@ public class GZIPContentDecoder
protected boolean decodedChunk(ByteBuffer chunk) protected boolean decodedChunk(ByteBuffer chunk)
{ {
if (_inflated==null) if (_inflated==null)
{
_inflated=chunk; _inflated=chunk;
}
else else
{ {
int size = _inflated.remaining() + chunk.remaining(); int size = _inflated.remaining() + chunk.remaining();
@ -103,7 +105,7 @@ public class GZIPContentDecoder
} }
else else
{ {
ByteBuffer bigger=_pool==null?BufferUtil.allocate(size):_pool.acquire(size,false); ByteBuffer bigger=acquire(size);
int pos=BufferUtil.flipToFill(bigger); int pos=BufferUtil.flipToFill(bigger);
BufferUtil.put(_inflated,bigger); BufferUtil.put(_inflated,bigger);
BufferUtil.put(chunk,bigger); BufferUtil.put(chunk,bigger);
@ -113,11 +115,9 @@ public class GZIPContentDecoder
_inflated = bigger; _inflated = bigger;
} }
} }
return false; return false;
} }
/** /**
* Inflate compressed data. * Inflate compressed data.
* <p>Inflation continues until the compressed block end is reached, there is no * <p>Inflation continues until the compressed block end is reached, there is no
@ -170,7 +170,7 @@ public class GZIPContentDecoder
while (true) while (true)
{ {
if (buffer==null) if (buffer==null)
buffer = acquire(); buffer = acquire(_bufferSize);
try try
{ {
@ -396,9 +396,9 @@ public class GZIPContentDecoder
/** /**
* @return An indirect buffer of the configured buffersize either from the pool or freshly allocated. * @return An indirect buffer of the configured buffersize either from the pool or freshly allocated.
*/ */
public ByteBuffer acquire() public ByteBuffer acquire(int capacity)
{ {
return _pool==null?BufferUtil.allocate(_bufferSize):_pool.acquire(_bufferSize,false); return _pool==null?BufferUtil.allocate(capacity):_pool.acquire(capacity,false);
} }
/** /**

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

@ -25,7 +25,6 @@ import java.util.ArrayDeque;
import java.util.Deque; import java.util.Deque;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
@ -48,10 +47,6 @@ import org.eclipse.jetty.util.log.Logger;
* whether there is content to consume and the EOF state that tells whether an EOF has arrived. Only once the content has been consumed the content state is * whether there is content to consume and the EOF state that tells whether an EOF has arrived. Only once the content has been consumed the content state is
* moved to the EOF state. * moved to the EOF state.
*/ */
/**
* @author gregw
*
*/
public class HttpInput extends ServletInputStream implements Runnable public class HttpInput extends ServletInputStream implements Runnable
{ {
/** /**
@ -109,7 +104,7 @@ public class HttpInput extends ServletInputStream implements Runnable
@Override @Override
public Content readFrom(Content content) public Content readFrom(Content content)
{ {
return _next.readFrom(_prev.readFrom(content)); return getNext().readFrom(getPrev().readFrom(content));
} }
} }