andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename variables to reduce confusion

Browse Source
This commit is contained in:
Trustin Lee 2012-08-17 11:33:54 +09:00
parent 37d10f3ec3
commit c509a278c3
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/org/jboss/netty/handler/codec/http/HttpMessageEncoder.java
View File

@ -50,7 +50,7 @@ public abstract class HttpMessageEncoder extends OneToOneEncoder {
private static final ChannelBuffer LAST_CHUNK = private static final ChannelBuffer LAST_CHUNK =
copiedBuffer("0\r\n\r\n", CharsetUtil.US_ASCII); copiedBuffer("0\r\n\r\n", CharsetUtil.US_ASCII);
private volatile boolean chunked; private volatile boolean transferEncodingChunked;
/** /**
* Creates a new instance. * Creates a new instance.
@ -63,11 +63,12 @@ public abstract class HttpMessageEncoder extends OneToOneEncoder {
protected Object encode(ChannelHandlerContext ctx, Channel channel, Object msg) throws Exception { protected Object encode(ChannelHandlerContext ctx, Channel channel, Object msg) throws Exception {
if (msg instanceof HttpMessage) { if (msg instanceof HttpMessage) {
HttpMessage m = (HttpMessage) msg; HttpMessage m = (HttpMessage) msg;
boolean chunked; boolean contentMustBeEmpty;
if (m.isChunked()) { if (m.isChunked()) {
// if Content-Length is set then the message can't be HTTP chunked // if Content-Length is set then the message can't be HTTP chunked
if (HttpCodecUtil.isContentLengthSet(m)) { if (HttpCodecUtil.isContentLengthSet(m)) {
chunked = this.chunked = false; contentMustBeEmpty = false;
transferEncodingChunked = false;
HttpCodecUtil.removeTransferEncodingChunked(m); HttpCodecUtil.removeTransferEncodingChunked(m);
} else { } else {
// check if the Transfer-Encoding is set to chunked already. // check if the Transfer-Encoding is set to chunked already.
@ -75,11 +76,13 @@ public abstract class HttpMessageEncoder extends OneToOneEncoder {
if (!HttpCodecUtil.isTransferEncodingChunked(m)) { if (!HttpCodecUtil.isTransferEncodingChunked(m)) {
m.addHeader(Names.TRANSFER_ENCODING, Values.CHUNKED); m.addHeader(Names.TRANSFER_ENCODING, Values.CHUNKED);
} }
chunked = this.chunked = true; contentMustBeEmpty = true;
transferEncodingChunked = true;
} }
} else { } else {
chunked = this.chunked = HttpCodecUtil.isTransferEncodingChunked(m); transferEncodingChunked = contentMustBeEmpty = HttpCodecUtil.isTransferEncodingChunked(m);
} }
ChannelBuffer header = ChannelBuffers.dynamicBuffer( ChannelBuffer header = ChannelBuffers.dynamicBuffer(
channel.getConfig().getBufferFactory()); channel.getConfig().getBufferFactory());
encodeInitialLine(header, m); encodeInitialLine(header, m);
@ -90,7 +93,7 @@ public abstract class HttpMessageEncoder extends OneToOneEncoder {
ChannelBuffer content = m.getContent(); ChannelBuffer content = m.getContent();
if (!content.readable()) { if (!content.readable()) {
return header; // no content return header; // no content
} else if (chunked) { } else if (contentMustBeEmpty) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"HttpMessage.content must be empty " + "HttpMessage.content must be empty " +
"if Transfer-Encoding is chunked."); "if Transfer-Encoding is chunked.");
@ -101,9 +104,9 @@ public abstract class HttpMessageEncoder extends OneToOneEncoder {
if (msg instanceof HttpChunk) { if (msg instanceof HttpChunk) {
HttpChunk chunk = (HttpChunk) msg; HttpChunk chunk = (HttpChunk) msg;
if (chunked) { if (transferEncodingChunked) {
if (chunk.isLast()) { if (chunk.isLast()) {
chunked = false; transferEncodingChunked = false;
if (chunk instanceof HttpChunkTrailer) { if (chunk instanceof HttpChunkTrailer) {
ChannelBuffer trailer = ChannelBuffers.dynamicBuffer( ChannelBuffer trailer = ChannelBuffers.dynamicBuffer(
channel.getConfig().getBufferFactory()); channel.getConfig().getBufferFactory());