wip

Author: ibrandes

sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/implementation/structuredmessage/StructuredMessageEncoder.java

@@ -108,9 +108,7 @@ private byte[] generateMessageHeader() {
         return buffer.array();
     }
 
-    private byte[] generateSegmentHeader() {
-        int segmentContentSize = Math.min(segmentSize, contentLength - currentContentOffset);
-        // 2 byte number, 8 byte size
+    private byte[] generateSegmentHeader(int segmentContentSize) {
         ByteBuffer buffer = ByteBuffer.allocate(getSegmentHeaderLength()).order(ByteOrder.LITTLE_ENDIAN);
         buffer.putShort((short) currentSegmentNumber);
         buffer.putLong(segmentContentSize);
@@ -155,7 +153,9 @@ public Flux<ByteBuffer> encode(ByteBuffer unencodedBuffer) {
                 // if we are at the beginning of a segment's content, encode segment header
                 if (currentSegmentOffset == 0) {
                     incrementCurrentSegment();
-                    buffers.add(ByteBuffer.wrap(generateSegmentHeader()));
+                    // Calculate actual segment size based on remaining content
+                    int actualSegmentSize = Math.min(segmentSize, contentLength - currentContentOffset);
+                    buffers.add(ByteBuffer.wrap(generateSegmentHeader(actualSegmentSize)));
                 }
 
                 buffers.add(encodeSegmentContent(unencodedBuffer));