Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 18661 invoked from network); 12 Nov 2010 08:12:28 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 12 Nov 2010 08:12:28 -0000 Received: (qmail 77863 invoked by uid 500); 12 Nov 2010 08:12:59 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 77833 invoked by uid 500); 12 Nov 2010 08:12:59 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 77826 invoked by uid 99); 12 Nov 2010 08:12:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Nov 2010 08:12:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Nov 2010 08:12:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C060E23888EA; Fri, 12 Nov 2010 08:11:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1034289 - /geronimo/server/branches/2.2/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java Date: Fri, 12 Nov 2010 08:11:41 -0000 To: scm@geronimo.apache.org From: xuhaihong@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101112081141.C060E23888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: xuhaihong Date: Fri Nov 12 08:11:41 2010 New Revision: 1034289 URL: http://svn.apache.org/viewvc?rev=1034289&view=rev Log: Never call getConfigurationData until all the deployment actions are done Modified: geronimo/server/branches/2.2/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java Modified: geronimo/server/branches/2.2/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java?rev=1034289&r1=1034288&r2=1034289&view=diff ============================================================================== --- geronimo/server/branches/2.2/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java (original) +++ geronimo/server/branches/2.2/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java Fri Nov 12 08:11:41 2010 @@ -108,12 +108,12 @@ public class PersistenceUnitBuilder impl File rootBaseFile; URI moduleBaseURI; - if (module.getRootEarContext().getConfigurationData().getInPlaceConfigurationDir() == null) { - rootBaseFile = module.getRootEarContext().getConfigurationData().getConfigurationDir(); + if (module.getRootEarContext().getInPlaceConfigurationDir() == null) { + rootBaseFile = module.getRootEarContext().getConfigurationDir(); moduleBaseURI = moduleContext.getBaseDir().toURI(); } else { - rootBaseFile = module.getRootEarContext().getConfigurationData().getInPlaceConfigurationDir(); - moduleBaseURI = moduleContext.getConfigurationData().getInPlaceConfigurationDir().toURI(); + rootBaseFile = module.getRootEarContext().getInPlaceConfigurationDir(); + moduleBaseURI = moduleContext.getInPlaceConfigurationDir().toURI(); } String rootBase = rootBaseFile.toURI().normalize().toString();