Implement custom toArray function, some of our code reuses the underlying array and so the out-of-the box solution doesn't work as expected.

johnmay · johnmay · commit 2e4ceabe4989 · 2019-03-15T10:37:14.000Z
diff --git a/base/isomorphism/src/main/java/org/openscience/cdk/isomorphism/Mappings.java b/base/isomorphism/src/main/java/org/openscience/cdk/isomorphism/Mappings.java
@@ -37,6 +37,7 @@
 import org.openscience.cdk.interfaces.IChemObject;
 import org.openscience.cdk.isomorphism.matchers.IQueryAtomContainer;
 
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.Map;
 
@@ -352,7 +353,14 @@ public Iterator<int[]> iterator() {
      * @return array of mappings
      */
     public int[][] toArray() {
-        return Iterables.toArray(iterable, int[].class);
+        int[][] res = new int[14][];
+        int size = 0;
+        for (int[] map : this) {
+            if (size == res.length)
+                res = Arrays.copyOf(res, size + (size >> 1));
+            res[size++] = map.clone();
+        }
+        return Arrays.copyOf(res, size);
     }
 
     /**
