diff --git a/jOOQ/src/main/java/org/jooq/impl/JoinTable.java b/jOOQ/src/main/java/org/jooq/impl/JoinTable.java index 48960fc079..89ca6dd98b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JoinTable.java +++ b/jOOQ/src/main/java/org/jooq/impl/JoinTable.java @@ -290,12 +290,14 @@ class JoinTable extends AbstractTable implements TableOptionalOnStep, Ta @Override protected final FieldList getFieldList() { - FieldList result = new FieldList(); + Field[] l = lhs.asTable().fields(); + Field[] r = rhs.asTable().fields(); + Field[] all = new Field[l.length + r.length]; - result.addAll(lhs.asTable().fields()); - result.addAll(rhs.asTable().fields()); + System.arraycopy(l, 0, all, 0, l.length); + System.arraycopy(r, 0, all, l.length, r.length); - return result; + return new FieldList(all); } @Override diff --git a/jOOQ/src/main/java/org/jooq/impl/QueryPartList.java b/jOOQ/src/main/java/org/jooq/impl/QueryPartList.java index 5eda0d493e..a1f8ca062e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/QueryPartList.java +++ b/jOOQ/src/main/java/org/jooq/impl/QueryPartList.java @@ -36,8 +36,6 @@ package org.jooq.impl; -import static org.jooq.impl.Utils.list; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -175,19 +173,11 @@ class QueryPartList extends AbstractQueryPart implements Li return wrappedList.addAll(removeNulls(c)); } - final boolean addAll(T... c) { - return addAll(list(c)); - } - @Override public final boolean addAll(int index, Collection c) { return wrappedList.addAll(index, removeNulls(c)); } - final boolean addAll(int index, T... c) { - return addAll(index, list(c)); - } - private final Collection removeNulls(Collection c) { // [#2145] Collections that contain nulls are quite rare, so it is wise