Return-Path: Delivered-To: apmail-incubator-cayenne-commits-archive@locus.apache.org Received: (qmail 16518 invoked from network); 15 Oct 2006 02:10:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 15 Oct 2006 02:10:13 -0000 Received: (qmail 93158 invoked by uid 500); 15 Oct 2006 02:10:13 -0000 Delivered-To: apmail-incubator-cayenne-commits-archive@incubator.apache.org Received: (qmail 93137 invoked by uid 500); 15 Oct 2006 02:10:13 -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 93128 invoked by uid 99); 15 Oct 2006 02:10:13 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Oct 2006 19:10:13 -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; Sat, 14 Oct 2006 19:10:13 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id BD6A21A981A; Sat, 14 Oct 2006 19:09:52 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r464097 - in /incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access: DataContextQueryAction.java ObjectStore.java Date: Sun, 15 Oct 2006 02:09:52 -0000 To: cayenne-commits@incubator.apache.org From: aadamchik@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061015020952.BD6A21A981A@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: Sat Oct 14 19:09:50 2006 New Revision: 464097 URL: http://svn.apache.org/viewvc?view=rev&rev=464097 Log: CAY-693: DataContext should not return HOLLOW objects in response to ObjectIdQuery() Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContextQueryAction.java incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/ObjectStore.java Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContextQueryAction.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContextQueryAction.java?view=diff&rev=464097&r1=464096&r2=464097 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContextQueryAction.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContextQueryAction.java Sat Oct 14 19:09:50 2006 @@ -84,6 +84,10 @@ object = ((DataContext) actingContext) .currentSnapshot((DataObject) object); } + // do not return hollow objects + else if (((Persistent) object).getPersistenceState() == PersistenceState.HOLLOW) { + return !DONE; + } this.response = new ListResponse(object); return DONE; Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/ObjectStore.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/ObjectStore.java?view=diff&rev=464097&r1=464096&r2=464097 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/ObjectStore.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/ObjectStore.java Sat Oct 14 19:09:50 2006 @@ -667,20 +667,7 @@ // handle deleted object if (results.size() == 0) { processDeletedID(object.getObjectId()); - } - else if (object.getPersistenceState() == PersistenceState.HOLLOW) { - - // if HOLLOW is returned (from parent DC?), rerun the query with forced - // fetch - query = new ObjectIdQuery( - object.getObjectId(), - false, - ObjectIdQuery.CACHE_REFRESH); - results = context.getChannel().onQuery(context, query).firstList(); - if (results.size() == 0) { - processDeletedID(object.getObjectId()); - } - } + } } }