You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by xu...@apache.org on 2010/11/12 09:12:09 UTC

svn commit: r1034290 - /geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java

Author: xuhaihong
Date: Fri Nov 12 08:12:09 2010
New Revision: 1034290

URL: http://svn.apache.org/viewvc?rev=1034290&view=rev
Log:
Never call getConfigurationData until all the deployment actions are done

Modified:
    geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java

Modified: geronimo/server/branches/2.1/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.1/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java?rev=1034290&r1=1034289&r2=1034290&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java (original)
+++ geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java Fri Nov 12 08:12:09 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().getConfiguration().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();