You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cayenne.apache.org by aa...@apache.org on 2014/03/18 07:06:25 UTC

svn commit: r1578748 - /cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/ResultScanParentAttachmentStrategy.java

Author: aadamchik
Date: Tue Mar 18 06:06:25 2014
New Revision: 1578748

URL: http://svn.apache.org/r1578748
Log:
CAY-1905 Multi-step prefetching NPE : 1..N..1 with absent N and root with no qualifier

fix suggested by Mikaël Cluseau (we don't have a test for it)

Modified:
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/ResultScanParentAttachmentStrategy.java

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/ResultScanParentAttachmentStrategy.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/ResultScanParentAttachmentStrategy.java?rev=1578748&r1=1578747&r2=1578748&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/ResultScanParentAttachmentStrategy.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/ResultScanParentAttachmentStrategy.java Tue Mar 18 06:06:25 2014
@@ -107,6 +107,10 @@ class ResultScanParentAttachmentStrategy
         }
         
         List<DataRow> rows = parentNode.getDataRows();
+        if(rows == null) {
+            return;
+        }
+        
         int size = objects.size();
         for (int i = 0; i < size; i++) {