Return-Path: Delivered-To: apmail-db-jdo-commits-archive@www.apache.org Received: (qmail 56978 invoked from network); 6 Jan 2008 20:05:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Jan 2008 20:05:43 -0000 Received: (qmail 71344 invoked by uid 500); 6 Jan 2008 20:05:32 -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 71333 invoked by uid 99); 6 Jan 2008 20:05:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Jan 2008 12:05:32 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Jan 2008 20:05:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E98A21A9850; Sun, 6 Jan 2008 12:05:18 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r609390 - in /db/jdo/trunk: tck2-legacy/src/java/org/apache/jdo/tck/query/QueryTest.java tck2/src/java/org/apache/jdo/tck/query/QueryTest.java Date: Sun, 06 Jan 2008 20:05:18 -0000 To: jdo-commits@db.apache.org From: mbo@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080106200518.E98A21A9850@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mbo Date: Sun Jan 6 12:05:17 2008 New Revision: 609390 URL: http://svn.apache.org/viewvc?rev=609390&view=rev Log: Fix minor bug in QueryTest in using variable pm from the superclass; the variable might not have been initialized Modified: db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/QueryTest.java db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/QueryTest.java Modified: db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/QueryTest.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/QueryTest.java?rev=609390&r1=609389&r2=609390&view=diff ============================================================================== --- db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/QueryTest.java (original) +++ db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/query/QueryTest.java Sun Jan 6 12:05:17 2008 @@ -200,7 +200,7 @@ */ public CompanyModelReader loadAndPersistCompanyModel(PersistenceManager pm) { makePersistentAll( - getCompanyModelReaderForPersistentInstances().getRootList()); + pm, getCompanyModelReaderForPersistentInstances().getRootList()); return getCompanyModelReaderForPersistentInstances(); } @@ -211,15 +211,17 @@ * instance allowing to access a compay model instance by name. */ public MylibReader loadAndPersistMylib(PersistenceManager pm) { - makePersistentAll(getMylibReaderForPersistentInstances().getRootList()); + makePersistentAll( + pm, getMylibReaderForPersistentInstances().getRootList()); return getMylibReaderForPersistentInstances(); } /** * Persists the given pc instances. + * @param pm the PersistenceManager * @param pcInstances the pc instances to persist */ - private void makePersistentAll(List pcInstances) { + private void makePersistentAll(PersistenceManager pm, List pcInstances) { Transaction tx = pm.currentTransaction(); tx.begin(); try { @@ -1117,6 +1119,7 @@ private Object execute(String assertion, QueryElementHolder queryElementHolder, boolean asSingleString, Object parameters, Object expectedResult) { + PersistenceManager pm = getPM(); Query query = asSingleString ? queryElementHolder.getSingleStringQuery(pm) : queryElementHolder.getAPIQuery(pm); @@ -1374,6 +1377,7 @@ private void delete(String assertion, QueryElementHolder queryElementHolder, boolean asSingleString, Object parameters, long expectedNrOfDeletedObjects) { + PersistenceManager pm = getPM(); Query query = asSingleString ? queryElementHolder.getSingleStringQuery(pm) : queryElementHolder.getAPIQuery(pm); Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/QueryTest.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/QueryTest.java?rev=609390&r1=609389&r2=609390&view=diff ============================================================================== --- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/QueryTest.java (original) +++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/QueryTest.java Sun Jan 6 12:05:17 2008 @@ -200,7 +200,7 @@ */ public CompanyModelReader loadAndPersistCompanyModel(PersistenceManager pm) { makePersistentAll( - getCompanyModelReaderForPersistentInstances().getRootList()); + pm, getCompanyModelReaderForPersistentInstances().getRootList()); return getCompanyModelReaderForPersistentInstances(); } @@ -211,15 +211,17 @@ * instance allowing to access a compay model instance by name. */ public MylibReader loadAndPersistMylib(PersistenceManager pm) { - makePersistentAll(getMylibReaderForPersistentInstances().getRootList()); + makePersistentAll( + pm, getMylibReaderForPersistentInstances().getRootList()); return getMylibReaderForPersistentInstances(); } /** * Persists the given pc instances. + * @param pm the PersistenceManager * @param pcInstances the pc instances to persist */ - private void makePersistentAll(List pcInstances) { + private void makePersistentAll(PersistenceManager pm, List pcInstances) { Transaction tx = pm.currentTransaction(); tx.begin(); try { @@ -1117,6 +1119,7 @@ private Object execute(String assertion, QueryElementHolder queryElementHolder, boolean asSingleString, Object parameters, Object expectedResult) { + PersistenceManager pm = getPM(); Query query = asSingleString ? queryElementHolder.getSingleStringQuery(pm) : queryElementHolder.getAPIQuery(pm); @@ -1374,6 +1377,7 @@ private void delete(String assertion, QueryElementHolder queryElementHolder, boolean asSingleString, Object parameters, long expectedNrOfDeletedObjects) { + PersistenceManager pm = getPM(); Query query = asSingleString ? queryElementHolder.getSingleStringQuery(pm) : queryElementHolder.getAPIQuery(pm);