openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From allee8...@apache.org
Subject svn commit: r813879 - /openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java
Date Fri, 11 Sep 2009 15:27:39 GMT
Author: allee8285
Date: Fri Sep 11 15:27:39 2009
New Revision: 813879

URL: http://svn.apache.org/viewvc?rev=813879&view=rev
Log:
OPENJPA-1292 - Committing contribution submitted by Tim McConnell.

Modified:
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java?rev=813879&r1=813878&r2=813879&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java
(original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java
Fri Sep 11 15:27:39 2009
@@ -95,9 +95,7 @@
             BrokerFactory factory = getBrokerFactory(cp, poolValue, null);
             OpenJPAConfiguration conf = factory.getConfiguration();
             _log = conf.getLog(OpenJPAConfiguration.LOG_RUNTIME);
-            if(pd.checkPuNameCollisions(_log,name)==true) {
-                ;//return null;
-            }
+            pd.checkPuNameCollisions(_log,name);
             
             loadAgent(_log, conf);
             
@@ -107,7 +105,9 @@
             
             return JPAFacadeHelper.toEntityManagerFactory(factory);
         } catch (Exception e) {
-            _log.error(_loc.get("create-emf-error", name), e);
+            if (_log != null) {
+                _log.error(_loc.get("create-emf-error", name), e);
+            }
             /*
              * Maintain 1.x behavior of throwing exceptions, even though
              * JPA2 9.2 - createEMF "must" return null for PU it can't handle



Mime
View raw message