From 138717a1ceebfc9bcd3c45af71abe8645df7088e Mon Sep 17 00:00:00 2001
From: Santiago Pericasgeertsen <santiago.pericasgeertsen@oracle.com>
Date: Tue, 16 Jan 2024 10:55:54 -0500
Subject: [PATCH] Alternative 4.

Signed-off-by: Santiago Pericasgeertsen <santiago.pericasgeertsen@oracle.com>
---
 .../common/buffers/CompositeArrayBufferData.java       | 10 +++-------
 .../common/buffers/CompositeListBufferData.java        | 10 +++-------
 .../src/main/java/io/helidon/http/HeadersImpl.java     |  2 +-
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/common/buffers/src/main/java/io/helidon/common/buffers/CompositeArrayBufferData.java b/common/buffers/src/main/java/io/helidon/common/buffers/CompositeArrayBufferData.java
index ed5cc1a91e5..cf9492a721c 100644
--- a/common/buffers/src/main/java/io/helidon/common/buffers/CompositeArrayBufferData.java
+++ b/common/buffers/src/main/java/io/helidon/common/buffers/CompositeArrayBufferData.java
@@ -41,15 +41,11 @@ public void writeTo(OutputStream out) {
         if (data.length == 1) {
             BufferData datum = data[0];
             if (!(datum instanceof CompositeBufferData)) {
-                int available = datum.available();
-                if (available > 0) {
-                    datum.writeTo(out);
-                    datum.skip(-available);
-                }
+                datum.writeTo(out);
+                return;
             }
-        } else {
-            copy().writeTo(out);
         }
+        copy().writeTo(out);
     }
 
     @Override
diff --git a/common/buffers/src/main/java/io/helidon/common/buffers/CompositeListBufferData.java b/common/buffers/src/main/java/io/helidon/common/buffers/CompositeListBufferData.java
index 5c1c2aa0442..66a405b73e4 100644
--- a/common/buffers/src/main/java/io/helidon/common/buffers/CompositeListBufferData.java
+++ b/common/buffers/src/main/java/io/helidon/common/buffers/CompositeListBufferData.java
@@ -59,15 +59,11 @@ public void writeTo(OutputStream out) {
         if (data.size() == 1) {
             BufferData datum = data.get(0);
             if (!(datum instanceof CompositeBufferData)) {
-                int available = datum.available();
-                if (available > 0) {
-                    datum.writeTo(out);
-                    datum.skip(-available);
-                }
+                datum.writeTo(out);
+                return;
             }
-        } else {
-            copy().writeTo(out);
         }
+        copy().writeTo(out);
     }
 
     @Override
diff --git a/http/http/src/main/java/io/helidon/http/HeadersImpl.java b/http/http/src/main/java/io/helidon/http/HeadersImpl.java
index 738a389f94c..f11c6de17a6 100644
--- a/http/http/src/main/java/io/helidon/http/HeadersImpl.java
+++ b/http/http/src/main/java/io/helidon/http/HeadersImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.