Return-Path: Delivered-To: apmail-db-jdo-commits-archive@www.apache.org Received: (qmail 61546 invoked from network); 3 Oct 2006 21:01:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 Oct 2006 21:01:15 -0000 Received: (qmail 22935 invoked by uid 500); 3 Oct 2006 21:01:14 -0000 Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jdo-dev@db.apache.org Delivered-To: mailing list jdo-commits@db.apache.org Received: (qmail 22924 invoked by uid 99); 3 Oct 2006 21:01:14 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Oct 2006 14:01:14 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received: from [140.211.166.113] ([140.211.166.113:59995] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id 36/12-00170-A9FC2254 for ; Tue, 03 Oct 2006 14:01:14 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 047201A981D; Tue, 3 Oct 2006 14:01:12 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r452620 - /db/jdo/branches/2.0.1/tck20/src/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPreclear.java Date: Tue, 03 Oct 2006 21:01:11 -0000 To: jdo-commits@db.apache.org From: mbo@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061003210112.047201A981D@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: mbo Date: Tue Oct 3 14:01:11 2006 New Revision: 452620 URL: http://svn.apache.org/viewvc?view=rev&rev=452620 Log: JDO-401: merged trunk change into branch 2.0.1 Modified: db/jdo/branches/2.0.1/tck20/src/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPreclear.java Modified: db/jdo/branches/2.0.1/tck20/src/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPreclear.java URL: http://svn.apache.org/viewvc/db/jdo/branches/2.0.1/tck20/src/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPreclear.java?view=diff&rev=452620&r1=452619&r2=452620 ============================================================================== --- db/jdo/branches/2.0.1/tck20/src/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPreclear.java (original) +++ db/jdo/branches/2.0.1/tck20/src/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPreclear.java Tue Oct 3 14:01:11 2006 @@ -96,6 +96,7 @@ t.commit(); InstanceCallbackClass.performPreClearTests = true; + t.setOptimistic(false); t.begin(); try { primaryObj = (InstanceCallbackClass)pm.getObjectById(primaryObjId, true);