Return-Path: Delivered-To: apmail-incubator-cayenne-commits-archive@locus.apache.org Received: (qmail 1111 invoked from network); 24 Jul 2006 19:59:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 24 Jul 2006 19:59:53 -0000 Received: (qmail 62953 invoked by uid 500); 24 Jul 2006 19:59:53 -0000 Delivered-To: apmail-incubator-cayenne-commits-archive@incubator.apache.org Received: (qmail 62935 invoked by uid 500); 24 Jul 2006 19:59:53 -0000 Mailing-List: contact cayenne-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cayenne-dev@incubator.apache.org Delivered-To: mailing list cayenne-commits@incubator.apache.org Received: (qmail 62926 invoked by uid 99); 24 Jul 2006 19:59:53 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Jul 2006 12:59:53 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Jul 2006 12:59:52 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id B65A91A981C; Mon, 24 Jul 2006 12:59:32 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r425168 - /incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/editor/SelectQueryPrefetchTab.java Date: Mon, 24 Jul 2006 19:59:32 -0000 To: cayenne-commits@incubator.apache.org From: aadamchik@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060724195932.B65A91A981C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: aadamchik Date: Mon Jul 24 12:59:31 2006 New Revision: 425168 URL: http://svn.apache.org/viewvc?rev=425168&view=rev Log: CAY-609 - 2.0 branch Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/editor/SelectQueryPrefetchTab.java Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/editor/SelectQueryPrefetchTab.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/editor/SelectQueryPrefetchTab.java?rev=425168&r1=425167&r2=425168&view=diff ============================================================================== --- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/editor/SelectQueryPrefetchTab.java (original) +++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/editor/SelectQueryPrefetchTab.java Mon Jul 24 12:59:31 2006 @@ -97,9 +97,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);