fixes #492 Avoid NPE when CallableStatement#getObject(int parameterIndex) returned null.

harawata · harawata · commit 2d6aed5d3d0c · 2015-11-13T03:49:19.000+09:00
diff --git a/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java b/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
@@ -146,6 +146,9 @@ public void handleOutputParameters(CallableStatement cs) throws SQLException {
   }
 
   private void handleRefCursorOutputParameter(ResultSet rs, ParameterMapping parameterMapping, MetaObject metaParam) throws SQLException {
+    if (rs == null) {
+      return;
+    }
     try {
       final String resultMapId = parameterMapping.getResultMapId();
       final ResultMap resultMap = configuration.getResultMap(resultMapId);

Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,9 @@ public void handleOutputParameters(CallableStatement cs) throws SQLException {`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`private void handleRefCursorOutputParameter(ResultSet rs, ParameterMapping parameterMapping, MetaObject metaParam) throws SQLException {`
	`149`	`+ if (rs == null) {`
	`150`	`+ return;`
	`151`	`+ }`
`149`	`152`	`try {`
`150`	`153`	`final String resultMapId = parameterMapping.getResultMapId();`
`151`	`154`	`final ResultMap resultMap = configuration.getResultMap(resultMapId);`