*

core/src/main/java/com/boydti/fawe/object/io/FastByteArrayOutputStream.java

@@ -7,9 +7,6 @@ import java.io.Writer;
 import java.util.ArrayDeque;
 import java.util.Arrays;
 import java.util.Iterator;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.ForkJoinPool;
 
 
 /**
@@ -68,39 +65,33 @@ public class FastByteArrayOutputStream extends OutputStream {
         return res;
     }
 
-    public byte[] toByteArray(ExecutorCompletionService service) {
+    public byte[] toByteArray() {
-        if (buffers.size() < 8) {
+        if (buffers.isEmpty()) {
-            return toByteArray();
+            if (buffer.length == index) {
+                return buffer;
             }
-        final byte[] data = new byte[getSize()];
+            buffer = Arrays.copyOfRange(buffer, 0, index);
+            return buffer;
+        }
+        byte[] data = new byte[getSize()];
+
         // Check if we have a list of buffers
         int pos = 0;
-        int count = 0;
+
         if (buffers != null) {
-            for (final byte[] bytes : buffers) {
+            for (byte[] bytes : buffers) {
-                final int finalPos = pos;
+                System.arraycopy(bytes, 0, data, pos, bytes.length);
-                count++;
-                service.submit(new Callable() {
-                    @Override
-                    public Object call() throws Exception {
-                        System.arraycopy(bytes, 0, data, finalPos, bytes.length);
-                        return null;
-                    }
-                });
                 pos += bytes.length;
             }
         }
-        try {
+
-            for (int i = 0; i < count; i++) {
-                service.take();
-            }
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
         // write the internal buffer directly
         System.arraycopy(buffer, 0, data, pos, index);
 
-        return data;
+        this.index = size + index;
+        this.buffer = data;
+        this.buffers.clear();
+        return this.buffer;
     }
 
     public String toString() {