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 2011/10/10 10:00:53 UTC
svn commit: r1180815 - in
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb:
config/AppInfoBuilder.java persistence/PersistenceUnitInfoImpl.java
Author: rmannibucau
Date: Mon Oct 10 08:00:53 2011
New Revision: 1180815
URL: http://svn.apache.org/viewvc?rev=1180815&view=rev
Log:
small fix to avoid an exception when hibernate starts
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java?rev=1180815&r1=1180814&r2=1180815&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java Mon Oct 10 08:00:53 2011
@@ -609,6 +609,8 @@ class AppInfoBuilder {
String className = info.properties.getProperty(lookupProperty);
+ info.persistenceUnitRootUrl = null; // to avoid HHH015010
+
if (className == null || className.startsWith("org.hibernate.transaction")){
info.properties.setProperty(lookupProperty, openejbLookupClass);
logger.debug("Adjusting PersistenceUnit(name="+info.name+") property to "+lookupProperty+"="+openejbLookupClass);
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java?rev=1180815&r1=1180814&r2=1180815&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java Mon Oct 10 08:00:53 2011
@@ -205,6 +205,10 @@ public class PersistenceUnitInfoImpl imp
}
public void setRootUrlAndJarUrls(String persistenceUnitRootUrl, List<String> jarFiles) throws MalformedURLException {
+ if (persistenceUnitRootUrl == null) { // can be the case for hibernate
+ return;
+ }
+
File root;
try{
final URI rootUri = URI.create(persistenceUnitRootUrl);