Make ParallelOutputStream compatible with Java 8

bamboo · bamboo · commit 61e4c1a971bc · 2024-06-24T13:39:59.000-03:00
Which doesn't support `ByteBuffer#flip`.
diff --git a/platforms/core-configuration/configuration-cache/src/main/kotlin/org/gradle/internal/cc/impl/io/ParallelOutputStream.kt b/platforms/core-configuration/configuration-cache/src/main/kotlin/org/gradle/internal/cc/impl/io/ParallelOutputStream.kt
@@ -19,6 +19,7 @@ package org.gradle.internal.cc.impl.io
 import org.gradle.internal.cc.base.debug
 import org.gradle.internal.cc.base.logger
 import java.io.OutputStream
+import java.nio.Buffer
 import java.util.Queue
 import java.util.concurrent.ArrayBlockingQueue
 import java.util.concurrent.ConcurrentLinkedQueue
@@ -58,7 +59,6 @@ object ParallelOutputStream {
         val readyQ = ConcurrentLinkedQueue<Packet>()
         val writer = thread(name = "CC writer", isDaemon = true, priority = Thread.NORM_PRIORITY) {
             try {
-                val buffer = ByteArray(PacketPool.packetSize)
                 createOutputStream().use { outputStream ->
                     while (true) {
                         val packet = readyQ.poll()
@@ -67,20 +67,18 @@ object ParallelOutputStream {
                             Thread.yield()
                             continue
                         }
-                        packet.flip()
+                        flip(packet)
                         if (!packet.hasRemaining()) {
                             /** producer is signaling end of stream
                              * see [QueuedOutputStream.close]
                              **/
                             break
                         }
                         try {
-                            val remaining = packet.remaining()
-                            packet.get(buffer, 0, remaining)
-                            outputStream.write(buffer, 0, remaining)
+                            outputStream.write(packet.array(), 0, packet.remaining())
                         } finally {
                             // always return the packet to the pool
-                            packet.flip()
+                            flip(packet)
                             packets.put(packet)
                         }
                     }
@@ -100,6 +98,14 @@ object ParallelOutputStream {
             writer.join()
         }
     }
+
+    private
+    fun flip(packet: Buffer) {
+        // packet.flip() is not available in Java 8
+        packet
+            .limit(packet.position())
+            .rewind()
+    }
 }
 
 
