svn commit: r1326726 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/HierarchicalObjectResolver.java

[aadamchik]

Author: aadamchik
Date: Mon Apr 16 18:25:23 2012
New Revision: 1326726

URL: http://svn.apache.org/viewvc?rev=1326726&view=rev
Log:
CAY-1681 Third prefetch kind - DISJOINT_BY_ID

cleanup

Modified:
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/HierarchicalObjectResolver.java

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/HierarchicalObjectResolver.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/HierarchicalObjectResolver.java?rev=1326726&r1=1326725&r2=1326726&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/HierarchicalObjectResolver.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/HierarchicalObjectResolver.java
 Mon Apr 16 18:25:23 2012
@@ -19,7 +19,6 @@
 
 package org.apache.cayenne.access;
 
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -163,10 +162,13 @@ class HierarchicalObjectResolver {
                 pathPrefix = buffer.append(".").toString();
             }
 
-            List parentDataRows = parentProcessorNode.getDataRows();
+            List<?> parentDataRows;
             if (parentProcessorNode instanceof PrefetchProcessorJointNode) {
                 parentDataRows = ((PrefetchProcessorJointNode) 
parentProcessorNode).getResolvedRows();
             }
+            else {
+                parentDataRows = parentProcessorNode.getDataRows();
+            }
 
             for (Object dataRow : parentDataRows) {