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

Revert "Let ProtobufEncoder extend MessageToByteEncoder which makes more sense. Related to [#1222]"

Browse Source 
This reverts commit 6a9d055f57.
This commit is contained in:
Norman Maurer 2013-04-02 07:56:49 +02:00
parent d9ac6638f4
commit 2e3b8f13ea
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufEncoder.java
View File

@ -24,7 +24,9 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelPipeline; import io.netty.channel.ChannelPipeline;
import io.netty.handler.codec.LengthFieldBasedFrameDecoder; import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
import io.netty.handler.codec.LengthFieldPrepender; import io.netty.handler.codec.LengthFieldPrepender;
import io.netty.handler.codec.MessageToByteEncoder; import io.netty.handler.codec.MessageToMessageEncoder;
import static io.netty.buffer.Unpooled.*;
/** /**
* Encodes the requested <a href="http://code.google.com/p/protobuf/">Google * Encodes the requested <a href="http://code.google.com/p/protobuf/">Google
@ -54,16 +56,16 @@ import io.netty.handler.codec.MessageToByteEncoder;
* </pre> * </pre>
*/ */
@Sharable @Sharable
public class ProtobufEncoder extends MessageToByteEncoder<MessageLiteOrBuilder> { public class ProtobufEncoder extends MessageToMessageEncoder<MessageLiteOrBuilder> {
@Override @Override
protected void encode(ChannelHandlerContext ctx, MessageLiteOrBuilder msg, ByteBuf out) throws Exception { protected Object encode(ChannelHandlerContext ctx, MessageLiteOrBuilder msg) throws Exception {
if (msg instanceof MessageLite) { if (msg instanceof MessageLite) {
out.writeBytes(((MessageLite) msg).toByteArray()); return wrappedBuffer(((MessageLite) msg).toByteArray());
return;
} }
if (msg instanceof MessageLite.Builder) { if (msg instanceof MessageLite.Builder) {
out.writeBytes(((MessageLite.Builder) msg).build().toByteArray()); return wrappedBuffer(((MessageLite.Builder) msg).build().toByteArray());
} }
return null;
} }
} }