~ release CompositeByteBuf when sending response

eclipse · Oct 12, 2022 · 204377f · 204377f
1 parent 7cf180f
commit 204377f
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/...n/java/org/eclipse/milo/opcua/stack/transport/server/uasc/UascServerSymmetricHandler.java b/...n/java/org/eclipse/milo/opcua/stack/transport/server/uasc/UascServerSymmetricHandler.java
@@ -209,6 +209,8 @@ private void onSecureMessage(ChannelHandlerContext ctx, ByteBuf buffer, List<Obj
 
     private void sendServiceResponse(UascServiceResponse response, ByteBuf outBuffer) {
         ByteBuf messageBuffer = BufferUtil.pooledBuffer();
+        CompositeByteBuf chunkComposite = BufferUtil.compositeBuffer();
+
         try {
             binaryEncoder.setBuffer(messageBuffer);
             binaryEncoder.encodeMessage(null, response.getResponseMessage());
@@ -222,7 +224,6 @@ private void sendServiceResponse(UascServiceResponse response, ByteBuf outBuffer
                 MessageType.SecureMessage
             );
 
-            CompositeByteBuf chunkComposite = BufferUtil.compositeBuffer();
 
             for (ByteBuf chunk : encodedMessage.getMessageChunks()) {
                 chunkComposite.addComponent(chunk);
@@ -240,6 +241,7 @@ private void sendServiceResponse(UascServiceResponse response, ByteBuf outBuffer
             sendServiceFault(response, outBuffer, e);
         } finally {
             messageBuffer.release();
+            chunkComposite.release();
         }
     }
 
@@ -258,6 +260,7 @@ private void sendServiceFault(UascServiceResponse response, ByteBuf outBuffer, E
         );
 
         ByteBuf messageBuffer = BufferUtil.pooledBuffer();
+        CompositeByteBuf chunkComposite = BufferUtil.compositeBuffer();
 
         try {
             binaryEncoder.setBuffer(messageBuffer);
@@ -272,8 +275,6 @@ private void sendServiceFault(UascServiceResponse response, ByteBuf outBuffer, E
                 MessageType.SecureMessage
             );
 
-            CompositeByteBuf chunkComposite = BufferUtil.compositeBuffer();
-
             for (ByteBuf chunk : encodedMessage.getMessageChunks()) {
                 chunkComposite.addComponent(chunk);
                 chunkComposite.writerIndex(chunkComposite.writerIndex() + chunk.readableBytes());
@@ -286,6 +287,7 @@ private void sendServiceFault(UascServiceResponse response, ByteBuf outBuffer, E
             logger.error("Error serializing ServiceFault: {}", e.getStatusCode(), e);
         } finally {
             messageBuffer.release();
+            chunkComposite.release();
         }
     }