diff --git a/src/main/java/dev/zarr/zarrjava/store/MemoryStore.java b/src/main/java/dev/zarr/zarrjava/store/MemoryStore.java index c1664e1..7857345 100644 --- a/src/main/java/dev/zarr/zarrjava/store/MemoryStore.java +++ b/src/main/java/dev/zarr/zarrjava/store/MemoryStore.java @@ -1,5 +1,7 @@ package dev.zarr.zarrjava.store; +import dev.zarr.zarrjava.utils.Utils; + import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.io.InputStream; @@ -55,7 +57,7 @@ public ByteBuffer get(String[] keys, long start, long end) { @Override public void set(String[] keys, ByteBuffer bytes) { - map.put(resolveKeys(keys), bytes.array()); + map.put(resolveKeys(keys), Utils.toArray(bytes)); } @Override diff --git a/src/main/java/dev/zarr/zarrjava/store/ZipStore.java b/src/main/java/dev/zarr/zarrjava/store/ZipStore.java index 603d8e3..cfcb3bd 100644 --- a/src/main/java/dev/zarr/zarrjava/store/ZipStore.java +++ b/src/main/java/dev/zarr/zarrjava/store/ZipStore.java @@ -1,5 +1,7 @@ package dev.zarr.zarrjava.store; +import dev.zarr.zarrjava.utils.Utils; + import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.io.IOException; @@ -62,13 +64,7 @@ public String getArchiveComment() throws IOException { return null; } - byte[] bufArray; - if (buffer.hasArray()) { - bufArray = buffer.array(); - } else { - bufArray = new byte[buffer.remaining()]; - buffer.duplicate().get(bufArray); - } + byte[] bufArray = Utils.toArray(buffer); String comment = getZipCommentFromBuffer(bufArray); if (comment != null) {