Simplified toArray

h2/src/main/org/h2/bnf/Bnf.java

@@ -327,7 +327,7 @@ public class Bnf {
             }
             list.add(s);
         }
-        return list.toArray(new String[0]);
+        return list.toArray(new String[list.size()]);
     }
 
     /**

h2/src/main/org/h2/command/dml/SelectUnion.java

@@ -314,8 +314,7 @@ public class SelectUnion extends Query {
             Message.throwInternalError("type=" + unionType);
         }
         buff.append('(').append(StringUtils.unEnclose(right.getPlanSQL())).append(')');
-        Expression[] exprList = new Expression[expressions.size()];
-        expressions.toArray(exprList);
+        Expression[] exprList = expressions.toArray(new Expression[expressions.size()]);
         if (sort != null) {
             buff.append(" ORDER BY ").append(sort.getSQL(exprList, exprList.length));
         }

h2/src/main/org/h2/util/ObjectArray.java

@@ -224,9 +224,11 @@ public class ObjectArray<T> implements Iterable<T> {
      * Convert this list to an array. The target array must be big enough.
      *
      * @param array the target array
+     * @return the array
      */
-    public void toArray(Object[] array) {
+    public T[] toArray(T[] array) {
         ObjectUtils.arrayCopy(data, array, size);
+        return array;
     }
 
     /**