Polishing #1240

Author: kazuki43zoo

src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java

@@ -698,10 +698,11 @@ private boolean allowedConstructor(final Constructor<?> constructor, final List<
     if (parameterTypes.length != classNames.size()) return false;
     for (int i = 0; i < parameterTypes.length; i++) {
       final Class<?> parameterType = parameterTypes[i];
-      final String className = classNames.get(i);
-      if (parameterType.isPrimitive() && !primitiveTypes.getWrapper(parameterType).getName().equals(className)) {
-        return false;
-      } else if (!parameterType.isPrimitive() && !parameterType.isAssignableFrom(toClassForName(className))) {
+      final Class<?> resultSetType = toClassForName(classNames.get(i));
+      boolean matches = parameterType.isPrimitive()
+          ? primitiveTypes.matchesWithWrapperType(parameterType, resultSetType)
+          : parameterType.isAssignableFrom(resultSetType);
+      if (!matches) {
         return false;
       }
     }

src/main/java/org/apache/ibatis/executor/resultset/PrimitiveTypes.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2017 the original author or authors.
+ *    Copyright 2009-2018 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -46,6 +46,18 @@ public Class<?> getWrapper(final Class<?> primitiveType) {
     return primitiveToWrappers.get(primitiveType);
   }
 
+  /**
+   * Whether or not a specifying type matches with the wrapper type corresponding a primitive type.
+   *
+   * @param primitiveType a primitive type
+   * @param targetType type of validating target
+   * @return if return {@code true}, a wrapper type is matched.
+   * @since 3.5.0
+   */
+  public boolean matchesWithWrapperType(final Class<?> primitiveType, final Class<?> targetType) {
+    return targetType == getWrapper(primitiveType);
+  }
+
   public Class<?> getPrimitive(final Class<?> wrapperType) {
     return wrappersToPrimitives.get(wrapperType);
   }

src/test/java/org/apache/ibatis/autoconstructor/WrapperSubject.java

@@ -25,6 +25,10 @@ public class WrapperSubject {
   private final int weight;
   private final Timestamp dt;
 
+  public WrapperSubject(final int id, final String name, final int age, final Short height, final Short weight, Timestamp dt) {
+    throw new IllegalStateException("This constructor must not be called because type mismatch.");
+  }
+
   public WrapperSubject(final int id, final String name, final int age, final Integer height, final Integer weight, Timestamp dt) {
     this.id = id;
     this.name = name;