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

Fix bug which leads to return HttpMessageEncoder implementations null if encoding a HttpChunk which is the last one. This vilates the OneToOneEncoder contract and so leads to a missing notification of the write future. See #493

Browse Source
This commit is contained in:
norman 2012-08-09 08:02:27 +02:00
parent 02f53c2b12
commit eb8757f1cb
2 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,11 +124,7 @@ public abstract class HttpMessageEncoder extends OneToOneEncoder {
wrappedBuffer(CRLF));
}
} else {
if (chunk.isLast()) {
return null;
} else {
return chunk.getContent();
}
return chunk.getContent();
}
}

42
src/test/java/org/jboss/netty/handler/codec/http/HttpMessageEncoderTest.java Normal file
View File

@ -0,0 +1,42 @@
/*
* Copyright 2012 The Netty Project
*
* The Netty Project licenses this file to you under the Apache License,
* version 2.0 (the "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*/
package org.jboss.netty.handler.codec.http;
import static org.junit.Assert.*;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.handler.codec.embedder.EncoderEmbedder;
import org.junit.Test;
public class HttpMessageEncoderTest {
// Test for #493
@Test
public void testHttpChunkIsLast() {
EncoderEmbedder<ChannelBuffer> encoder = new EncoderEmbedder<ChannelBuffer>(new HttpMessageEncoder() {
@Override
protected void encodeInitialLine(ChannelBuffer buf, HttpMessage message) throws Exception {
// do nothing
}
});
assertTrue(encoder.offer(HttpChunk.LAST_CHUNK));
assertTrue(encoder.finish());
assertNotNull(encoder.poll());
assertNull(encoder.poll());
}
}