[#9288] Restore IllegalArgumentException

jOOQ · May 17, 2021 · 5024f76 · 5024f76
1 parent ed5ed02
commit 5024f76
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldsImpl.java b/jOOQ/src/main/java/org/jooq/impl/FieldsImpl.java
@@ -97,7 +97,7 @@ final class FieldsImpl<R extends Record> extends AbstractQueryPart implements Re
 
     @Override
     public final <U> RecordMapper<R, U> mapper(int fieldIndex, Configuration configuration, Class<? extends U> type) {
-        return mapper(fieldIndex, converterOrFail(configuration, field(fieldIndex).getType(), type));
+        return mapper(fieldIndex, converterOrFail(configuration, fields[safeIndex(fieldIndex)].getType(), type));
     }
 
     @Override
@@ -332,6 +332,13 @@ public final Field<?> field(int index) {
         return null;
     }
 
+    final int safeIndex(int index) {
+        if (index >= 0 && index < fields.length)
+            return index;
+
+        throw new IllegalArgumentException("No field at index " + index + " in Record type " + fields);
+    }
+
     @Override
     public final <T> Field<T> field(int fieldIndex, Class<T> type) {
         Field<?> result = field(fieldIndex);

diff --git a/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java b/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java
@@ -1203,7 +1203,7 @@ else if (o2 == null)
         }
     }
 
-    final int safeIndex(int index) {
+    private final int safeIndex(int index) {
         if (index >= 0 && index < fields.size())
             return index;