We need to retain the wrapped buffer, not the components

flowpowered · Jan 26, 2014 · fa1b31e · fa1b31e
1 parent 5795ea8
commit fa1b31e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/com/flowpowered/networking/BasicChannelInitializer.java b/src/main/java/com/flowpowered/networking/BasicChannelInitializer.java
@@ -51,6 +51,11 @@ protected final void initChannel(SocketChannel c) {
         MessageEncoder encoder = new MessageEncoder(handler);
 
         // Left to right for encoding/sending/outbound; Right to left for decoding/receiving/inbound
-        c.pipeline().addLast(processorDecoder, processorEncoder, decoder, encoder, handler);
+        c.pipeline()
+                .addLast("processorDecoder", processorDecoder)
+                .addLast("decoder", decoder)
+                .addLast("processorEncoder", processorEncoder)
+                .addLast("encoder", encoder)
+                .addLast("handler", handler);
     }
 }
diff --git a/src/main/java/com/flowpowered/networking/pipeline/MessageEncoder.java b/src/main/java/com/flowpowered/networking/pipeline/MessageEncoder.java
@@ -54,13 +54,11 @@ protected void encode(ChannelHandlerContext ctx, Message message, List<Object> o
             throw new IOException("Unknown message type: " + clazz + ".");
         }
         final ByteBuf messageBuf = ctx.alloc().buffer();
-        messageBuf.retain();
         reg.getCodec().encode(messageBuf, message);
 
 
         final ByteBuf headerBuf = ctx.alloc().buffer();
-        headerBuf.retain();
         protocol.writeHeader(headerBuf, reg, messageBuf);
-        out.add(Unpooled.wrappedBuffer(headerBuf, messageBuf));
+        out.add(Unpooled.wrappedBuffer(headerBuf, messageBuf).retain());
     }
 }