From 611f54ada9b6328be45b57dee20723b2fedc1238 Mon Sep 17 00:00:00 2001
From: lorenzo <lorenzo@thoughtmachine.net>
Date: Thu, 16 Aug 2018 18:07:33 +0100
Subject: [PATCH 1/2] Fixed a race condition in DefaultRecordMapper.java

---
 .../org/jooq/impl/DefaultRecordMapper.java    | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultRecordMapper.java b/jOOQ/src/main/java/org/jooq/impl/DefaultRecordMapper.java
index 2d7d8114b5..3bacfa9a27 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultRecordMapper.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultRecordMapper.java
@@ -52,6 +52,21 @@ import static org.jooq.impl.Tools.getPropertyName;
 import static org.jooq.impl.Tools.hasColumnAnnotations;
 import static org.jooq.tools.reflect.Reflect.accessible;
 
+import org.jooq.Attachable;
+import org.jooq.Configuration;
+import org.jooq.Field;
+import org.jooq.Record;
+import org.jooq.Record1;
+import org.jooq.RecordMapper;
+import org.jooq.RecordMapperProvider;
+import org.jooq.RecordType;
+import org.jooq.conf.Settings;
+import org.jooq.exception.MappingException;
+import org.jooq.tools.Convert;
+import org.jooq.tools.StringUtils;
+import org.jooq.tools.reflect.Reflect;
+import org.jooq.tools.reflect.ReflectException;
+
 import java.beans.ConstructorProperties;
 import java.lang.invoke.MethodHandles.Lookup;
 import java.lang.reflect.Array;
@@ -80,21 +95,6 @@ import java.util.stream.Stream;
 
 import javax.persistence.Column;
 
-import org.jooq.Attachable;
-import org.jooq.Configuration;
-import org.jooq.Field;
-import org.jooq.Record;
-import org.jooq.Record1;
-import org.jooq.RecordMapper;
-import org.jooq.RecordMapperProvider;
-import org.jooq.RecordType;
-import org.jooq.conf.Settings;
-import org.jooq.exception.MappingException;
-import org.jooq.tools.Convert;
-import org.jooq.tools.StringUtils;
-import org.jooq.tools.reflect.Reflect;
-import org.jooq.tools.reflect.ReflectException;
-
 /**
  * This is the default implementation for <code>RecordMapper</code> types.
  * <p>
@@ -945,7 +945,6 @@ public class DefaultRecordMapper<R extends Record, E> implements RecordMapper<R,
 
         private final Constructor<E>                  constructor;
         private final Class<?>[]                      parameterTypes;
-        private final Object[]                        parameterValues;
         private final List<String>                    propertyNames;
         private final boolean                         useAnnotations;
         private final List<java.lang.reflect.Field>[] members;
@@ -957,7 +956,6 @@ public class DefaultRecordMapper<R extends Record, E> implements RecordMapper<R,
             this.propertyNames = propertyNames;
             this.useAnnotations = hasColumnAnnotations(configuration, type);
             this.parameterTypes = constructor.getParameterTypes();
-            this.parameterValues = new Object[parameterTypes.length];
             this.members = new List[fields.length];
             this.methods = new Method[fields.length];
             this.propertyIndexes = new Integer[fields.length];
@@ -994,6 +992,7 @@ public class DefaultRecordMapper<R extends Record, E> implements RecordMapper<R,
         @Override
         public final E map(R record) {
             try {
+                Object[] parameterValues = new Object[parameterTypes.length];
                 for (int i = 0; i < fields.length; i++) {
                     if (propertyIndexes[i] != null) {
                         parameterValues[propertyIndexes[i]] = record.get(i);

From 3d06139d8e385c3ef595f092e0079e4c9a1ca297 Mon Sep 17 00:00:00 2001
From: lorenzo <lorenzo@thoughtmachine.net>
Date: Thu, 16 Aug 2018 18:19:57 +0100
Subject: [PATCH 2/2] Reverted accidentally reordered imports

This reverts commit 611f54ada9b6328be45b57dee20723b2fedc1238.
---
 .../org/jooq/impl/DefaultRecordMapper.java    | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultRecordMapper.java b/jOOQ/src/main/java/org/jooq/impl/DefaultRecordMapper.java
index 3bacfa9a27..45dfe92d1f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultRecordMapper.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultRecordMapper.java
@@ -52,21 +52,6 @@ import static org.jooq.impl.Tools.getPropertyName;
 import static org.jooq.impl.Tools.hasColumnAnnotations;
 import static org.jooq.tools.reflect.Reflect.accessible;
 
-import org.jooq.Attachable;
-import org.jooq.Configuration;
-import org.jooq.Field;
-import org.jooq.Record;
-import org.jooq.Record1;
-import org.jooq.RecordMapper;
-import org.jooq.RecordMapperProvider;
-import org.jooq.RecordType;
-import org.jooq.conf.Settings;
-import org.jooq.exception.MappingException;
-import org.jooq.tools.Convert;
-import org.jooq.tools.StringUtils;
-import org.jooq.tools.reflect.Reflect;
-import org.jooq.tools.reflect.ReflectException;
-
 import java.beans.ConstructorProperties;
 import java.lang.invoke.MethodHandles.Lookup;
 import java.lang.reflect.Array;
@@ -95,6 +80,21 @@ import java.util.stream.Stream;
 
 import javax.persistence.Column;
 
+import org.jooq.Attachable;
+import org.jooq.Configuration;
+import org.jooq.Field;
+import org.jooq.Record;
+import org.jooq.Record1;
+import org.jooq.RecordMapper;
+import org.jooq.RecordMapperProvider;
+import org.jooq.RecordType;
+import org.jooq.conf.Settings;
+import org.jooq.exception.MappingException;
+import org.jooq.tools.Convert;
+import org.jooq.tools.StringUtils;
+import org.jooq.tools.reflect.Reflect;
+import org.jooq.tools.reflect.ReflectException;
+
 /**
  * This is the default implementation for <code>RecordMapper</code> types.
  * <p>