Forgot to revert a line after local testing.

harawata · harawata · commit 7ed1580a1c45 · 2018-01-16T02:32:10.000+09:00
diff --git a/src/main/java/org/apache/ibatis/binding/MapperMethod.java b/src/main/java/org/apache/ibatis/binding/MapperMethod.java
@@ -84,7 +84,8 @@ public Object execute(SqlSession sqlSession, Object[] args) {
         } else {
           Object param = method.convertArgsToSqlCommandParam(args);
           result = sqlSession.selectOne(command.getName(), param);
-          if (method.returnsOptional()) {
+          if (method.returnsOptional() &&
+              (result == null || !method.getReturnType().equals(result.getClass()))) {
             result = OptionalUtil.ofNullable(result);
           }
         }

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,8 @@ public Object execute(SqlSession sqlSession, Object[] args) {`
`84`	`84`	`} else {`
`85`	`85`	`Object param = method.convertArgsToSqlCommandParam(args);`
`86`	`86`	`result = sqlSession.selectOne(command.getName(), param);`
`87`		`- if (method.returnsOptional()) {`
	`87`	`+ if (method.returnsOptional() &&`
	`88`	`+ (result == null \|\| !method.getReturnType().equals(result.getClass()))) {`
`88`	`89`	`result = OptionalUtil.ofNullable(result);`
`89`	`90`	`}`
`90`	`91`	`}`