Skip to content

Commit 97a4fbe

Browse files
committed
Fixes #132. NPE.
1 parent f367494 commit 97a4fbe

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -156,16 +156,19 @@ public List<Object> handleResultSets(Statement stmt) throws SQLException {
156156
resultSetCount++;
157157
}
158158

159-
while (rsw != null && resultSetCount < mappedStatement.getResulSets().length) {
160-
ResultMapping parentMapping = nextResultMaps.get(mappedStatement.getResulSets()[resultSetCount]);
161-
if (parentMapping != null) {
162-
String nestedResultMapId = parentMapping.getNestedResultMapId();
163-
ResultMap resultMap = configuration.getResultMap(nestedResultMapId);
164-
handleResultSet(rsw, resultMap, null, parentMapping);
159+
String[] resultSets = mappedStatement.getResulSets();
160+
if (resultSets != null) {
161+
while (rsw != null && resultSetCount < resultSets.length) {
162+
ResultMapping parentMapping = nextResultMaps.get(resultSets[resultSetCount]);
163+
if (parentMapping != null) {
164+
String nestedResultMapId = parentMapping.getNestedResultMapId();
165+
ResultMap resultMap = configuration.getResultMap(nestedResultMapId);
166+
handleResultSet(rsw, resultMap, null, parentMapping);
167+
}
168+
rsw = getNextResultSet(stmt);
169+
cleanUpAfterHandlingResultSet();
170+
resultSetCount++;
165171
}
166-
rsw = getNextResultSet(stmt);
167-
cleanUpAfterHandlingResultSet();
168-
resultSetCount++;
169172
}
170173

171174
return collapseSingleResultList(multipleResults);

0 commit comments

Comments
 (0)