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

Fix a test failure

Browse Source
This commit is contained in:
Trustin Lee 2012-06-01 23:11:01 -07:00
parent 720f62d983
commit 14cf227c46
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
codec/src/main/java/io/netty/handler/codec/embedder/DecoderEmbedder.java
View File

@ -19,6 +19,7 @@ import io.netty.buffer.ChannelBuffer;
import io.netty.buffer.ChannelBuffers;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelPipeline;
import io.netty.channel.NoSuchBufferException;
import io.netty.handler.codec.CodecException;
import io.netty.handler.codec.DecoderException;
import io.netty.handler.codec.base64.Base64Decoder;
@ -57,7 +58,13 @@ public class DecoderEmbedder<E> extends AbstractCodecEmbedder<E> {
@Override
public boolean offer(Object input) {
if (input instanceof ChannelBuffer) {
try {
pipeline().inboundByteBuffer().writeBytes((ChannelBuffer) input);
} catch (NoSuchBufferException e) {
// Throwing and catching this exception is cheap because we do not fill
// stack traces internally (see DefaultChannelPipeline).
pipeline().inboundMessageBuffer().add(input);
}
} else {
pipeline().inboundMessageBuffer().add(input);
}

3
codec/src/test/java/io/netty/handler/codec/marshalling/AbstractCompatibleMarshallingDecoderTest.java
View File

@ -121,10 +121,7 @@ public abstract class AbstractCompatibleMarshallingDecoderTest {
fail();
} catch (CodecException e) {
assertEquals(TooLongFrameException.class, e.getClass());
}
}
protected ChannelHandler createDecoder(int maxObjectSize) {