You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/03/16 15:12:53 UTC
svn commit: r1301535 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityManagerFactoryCallable.java
Author: rmannibucau
Date: Fri Mar 16 14:12:52 2012
New Revision: 1301535
URL: http://svn.apache.org/viewvc?rev=1301535&view=rev
Log:
OPENEJB-1799 passing only not null ds in EMFCallable
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityManagerFactoryCallable.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityManagerFactoryCallable.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityManagerFactoryCallable.java?rev=1301535&r1=1301534&r2=1301535&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityManagerFactoryCallable.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityManagerFactoryCallable.java Fri Mar 16 14:12:52 2012
@@ -44,11 +44,12 @@ public class EntityManagerFactoryCallabl
properties.put("javax.persistence.validator.ValidatorFactory", new ValidatorFactoryWrapper());
EntityManagerFactory emf = persistenceProvider.createContainerEntityManagerFactory(unitInfo, properties);
-
- final ImportSql importer = new ImportSql(appClassLoader, unitInfo.getPersistenceUnitName(), unitInfo.getNonJtaDataSource());
- if (importer.hasSomethingToImport()) {
- emf.createEntityManager().close(); // to let OpenJPA create the database if configured this way
- importer.doImport();
+ if (unitInfo.getNonJtaDataSource() != null) {
+ final ImportSql importer = new ImportSql(appClassLoader, unitInfo.getPersistenceUnitName(), unitInfo.getNonJtaDataSource());
+ if (importer.hasSomethingToImport()) {
+ emf.createEntityManager().close(); // to let OpenJPA create the database if configured this way
+ importer.doImport();
+ }
}
return emf;