Return-Path: Delivered-To: apmail-incubator-cayenne-commits-archive@locus.apache.org Received: (qmail 86084 invoked from network); 14 Oct 2006 22:14:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 14 Oct 2006 22:14:10 -0000 Received: (qmail 58347 invoked by uid 500); 14 Oct 2006 22:14:10 -0000 Delivered-To: apmail-incubator-cayenne-commits-archive@incubator.apache.org Received: (qmail 58322 invoked by uid 500); 14 Oct 2006 22:14:10 -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 58306 invoked by uid 99); 14 Oct 2006 22:14:10 -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 15:14:10 -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 15:14:09 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 39A511A981A; Sat, 14 Oct 2006 15:13:40 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r464045 - /incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java Date: Sat, 14 Oct 2006 22:13:39 -0000 To: cayenne-commits@incubator.apache.org From: aadamchik@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061014221340.39A511A981A@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 15:13:37 2006 New Revision: 464045 URL: http://svn.apache.org/viewvc?view=rev&rev=464045 Log: CAY-686: Weed out DataObject references from the access stack classes, replacing them with Persistent and ClassDescriptor (removing DataObject dependency from DataContext.prepareForAccess) Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java?view=diff&rev=464045&r1=464044&r2=464045 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java Sat Oct 14 15:13:37 2006 @@ -856,7 +856,8 @@ property.injectValueHolder(persistent); if (!property.isFault(persistent)) { - Iterator it = ((Collection) property.readProperty(persistent)).iterator(); + Iterator it = ((Collection) property.readProperty(persistent)) + .iterator(); while (it.hasNext()) { Object target = it.next(); @@ -1598,12 +1599,7 @@ if (object.getPersistenceState() == PersistenceState.HOLLOW) { - if (!(object instanceof DataObject)) { - throw new CayenneRuntimeException("Can only resolve DataObjects. Got: " - + object); - } - - getObjectStore().resolveHollow((DataObject) object); + getObjectStore().resolveHollow(object); if (object.getPersistenceState() != PersistenceState.COMMITTED) { String state = PersistenceState.persistenceStateName(object