fixes #215 There are two separate changes here. 1) A circulary referenced resultMap will be filled with ancestor only when the columnPrefix attribute is not specified for the nested result mapping. 2) When columnPrefix is specified for a nested result mapping and there is no column with that prefix in the result set, skip filling the nested result mapping to prevent stack overflow.

Author: harawata

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

@@ -887,23 +887,27 @@ private boolean applyNestedResultMappings(ResultSetWrapper rsw, ResultMap result
         try {
           final String columnPrefix = getColumnPrefix(parentPrefix, resultMapping);
           final ResultMap nestedResultMap = getNestedResultMap(rsw.getResultSet(), nestedResultMapId, columnPrefix);
-          Object ancestorObject = ancestorObjects.get(nestedResultMapId);
-          if (ancestorObject != null) {
-            if (newObject) {
-              linkObjects(metaObject, resultMapping, ancestorObject); // issue #385
-            }
-          } else {
-            final CacheKey rowKey = createRowKey(nestedResultMap, rsw, columnPrefix);
-            final CacheKey combinedKey = combineKeys(rowKey, parentRowKey);
-            Object rowValue = nestedResultObjects.get(combinedKey);
-            boolean knownValue = (rowValue != null);
-            instantiateCollectionPropertyIfAppropriate(resultMapping, metaObject); // mandatory            
-            if (anyNotNullColumnHasValue(resultMapping, columnPrefix, rsw.getResultSet())) {
-              rowValue = getRowValue(rsw, nestedResultMap, combinedKey, columnPrefix, rowValue);
-              if (rowValue != null && !knownValue) {
-                linkObjects(metaObject, resultMapping, rowValue);
-                foundValues = true;
+          if (resultMapping.getColumnPrefix() == null) {
+            // try to fill circular reference only when columnPrefix
+            // is not specified for the nested result map (issue #215)
+            Object ancestorObject = ancestorObjects.get(nestedResultMapId);
+            if (ancestorObject != null) {
+              if (newObject) {
+                linkObjects(metaObject, resultMapping, ancestorObject); // issue #385
               }
+              continue;
+            }
+          } 
+          final CacheKey rowKey = createRowKey(nestedResultMap, rsw, columnPrefix);
+          final CacheKey combinedKey = combineKeys(rowKey, parentRowKey);
+          Object rowValue = nestedResultObjects.get(combinedKey);
+          boolean knownValue = (rowValue != null);
+          instantiateCollectionPropertyIfAppropriate(resultMapping, metaObject); // mandatory
+          if (anyNotNullColumnHasValue(resultMapping, columnPrefix, rsw)) {
+            rowValue = getRowValue(rsw, nestedResultMap, combinedKey, columnPrefix, rowValue);
+            if (rowValue != null && !knownValue) {
+              linkObjects(metaObject, resultMapping, rowValue);
+              foundValues = true;
             }
           }
         } catch (SQLException e) {
@@ -925,20 +929,26 @@ private String getColumnPrefix(String parentPrefix, ResultMapping resultMapping)
     return columnPrefixBuilder.length() == 0 ? null : columnPrefixBuilder.toString().toUpperCase(Locale.ENGLISH);
   }
 
-  private boolean anyNotNullColumnHasValue(ResultMapping resultMapping, String columnPrefix, ResultSet rs) throws SQLException {
+  private boolean anyNotNullColumnHasValue(ResultMapping resultMapping, String columnPrefix, ResultSetWrapper rsw) throws SQLException {
     Set<String> notNullColumns = resultMapping.getNotNullColumns();
-    boolean anyNotNullColumnHasValue = true;
     if (notNullColumns != null && !notNullColumns.isEmpty()) {
-      anyNotNullColumnHasValue = false;
+      ResultSet rs = rsw.getResultSet();
       for (String column: notNullColumns) {
         rs.getObject(prependPrefix(column, columnPrefix));
         if (!rs.wasNull()) {
-          anyNotNullColumnHasValue = true;
-          break;
+          return true;
+        }
+      }
+      return false;
+    } else if (columnPrefix != null) {
+      for (String columnName : rsw.getColumnNames()) {
+        if (columnName.toUpperCase().startsWith(columnPrefix.toUpperCase())) {
+          return true;
         }
       }
+      return false;
     }
-    return anyNotNullColumnHasValue;
+    return true;
   }
 
   private ResultMap getNestedResultMap(ResultSet rs, String nestedResultMapId, String columnPrefix) throws SQLException {

src/test/java/org/apache/ibatis/submitted/ancestor_ref/AncestorRefTest.java

@@ -50,7 +50,6 @@ public static void setUp() throws Exception {
     session.close();
   }
 
-  @Ignore("issue #215")
   @Test
   public void testCircularAssociation() {
     SqlSession sqlSession = sqlSessionFactory.openSession();
@@ -63,7 +62,6 @@ public void testCircularAssociation() {
     }
   }
 
-  @Ignore("issue #215")
   @Test
   public void testCircularCollection() {
     SqlSession sqlSession = sqlSessionFactory.openSession();