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 2006/07/24 21:55:56 UTC

svn commit: r425165 - /incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/SelectQueryPrefetchTab.java

Author: aadamchik
Date: Mon Jul 24 12:55:55 2006
New Revision: 425165

URL: http://svn.apache.org/viewvc?rev=425165&view=rev
Log:
CAY-609 (1.2 branch)

Modified:
    incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/SelectQueryPrefetchTab.java

Modified: incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/SelectQueryPrefetchTab.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/SelectQueryPrefetchTab.java?rev=425165&r1=425164&r2=425165&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/SelectQueryPrefetchTab.java (original)
+++ incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/SelectQueryPrefetchTab.java Mon Jul 24 12:55:55 2006
@@ -133,9 +133,12 @@
         }
 
         // check if such prefetch already exists
-        if (selectQuery.getPrefetchTree() != null
-                && selectQuery.getPrefetchTree().getNode(prefetch) != null) {
-            return;
+        if (selectQuery.getPrefetchTree() != null) {
+
+            PrefetchTreeNode node = selectQuery.getPrefetchTree().getNode(prefetch);
+            if (node != null && !node.isPhantom()) {
+                return;
+            }
         }
 
         selectQuery.addPrefetch(prefetch);