Ensure BufUtil.release() is called even if writeBytes() fails in writeAndRelease()

trustin · trustin · commit 03955428bc97 · 2013-04-04T14:50:25.000+09:00
diff --git a/codec/src/main/java/io/netty/handler/codec/OutputMessageBuf.java b/codec/src/main/java/io/netty/handler/codec/OutputMessageBuf.java
@@ -167,7 +167,10 @@ public boolean drainToNextOutbound(ChannelHandlerContext ctx) {
     }
 
     private static void writeAndRelease(ByteBuf dst, ByteBuf src) {
-        dst.writeBytes(src, src.readerIndex(), src.readableBytes());
-        BufUtil.release(src);
+        try {
+            dst.writeBytes(src, src.readerIndex(), src.readableBytes());
+        } finally {
+            BufUtil.release(src);
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,10 @@ public boolean drainToNextOutbound(ChannelHandlerContext ctx) {`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`private static void writeAndRelease(ByteBuf dst, ByteBuf src) {`
`170`		`- dst.writeBytes(src, src.readerIndex(), src.readableBytes());`
`171`		`- BufUtil.release(src);`
	`170`	`+ try {`
	`171`	`+ dst.writeBytes(src, src.readerIndex(), src.readableBytes());`
	`172`	`+ } finally {`
	`173`	`+ BufUtil.release(src);`
	`174`	`+ }`
`172`	`175`	`}`
`173`	`176`	`}`