should use ids if there are any

emacarron · emacarron · commit 621a30d372f7 · 2013-01-20T14:21:08.000Z
diff --git a/src/main/java/org/apache/ibatis/executor/resultset/NestedResultSetHandler.java b/src/main/java/org/apache/ibatis/executor/resultset/NestedResultSetHandler.java
@@ -264,7 +264,7 @@ private void createRowKeyForMappedProperties(ResultMap resultMap, ResultSet rs,
         List<ResultFlag> flags = resultMapping.getFlags();
         if (flags.contains(ResultFlag.ASSOCIATION) || flags.contains(ResultFlag.CONSTRUCTOR)) {
           final ResultMap nestedResultMap = configuration.getResultMap(nestedResultMapId);
-          createRowKeyForMappedProperties(nestedResultMap, rs, cacheKey, nestedResultMap.getResultMappings(),
+          createRowKeyForMappedProperties(nestedResultMap, rs, cacheKey, getResultMappingsForRowKey(nestedResultMap),
               prependPrefix(resultMapping.getColumnPrefix(), columnPrefix), resultColumnCache);
         }
       } else if (resultMapping.getNestedQueryId() == null) {

Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ private void createRowKeyForMappedProperties(ResultMap resultMap, ResultSet rs,`
`264`	`264`	`List<ResultFlag> flags = resultMapping.getFlags();`
`265`	`265`	`if (flags.contains(ResultFlag.ASSOCIATION) \|\| flags.contains(ResultFlag.CONSTRUCTOR)) {`
`266`	`266`	`final ResultMap nestedResultMap = configuration.getResultMap(nestedResultMapId);`
`267`		`- createRowKeyForMappedProperties(nestedResultMap, rs, cacheKey, nestedResultMap.getResultMappings(),`
	`267`	`+ createRowKeyForMappedProperties(nestedResultMap, rs, cacheKey, getResultMappingsForRowKey(nestedResultMap),`
`268`	`268`	`prependPrefix(resultMapping.getColumnPrefix(), columnPrefix), resultColumnCache);`
`269`	`269`	`}`
`270`	`270`	`} else if (resultMapping.getNestedQueryId() == null) {`