You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2014/05/20 13:27:06 UTC

svn commit: r1596202 - /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java

Author: jlmonteiro
Date: Tue May 20 11:27:06 2014
New Revision: 1596202

URL: http://svn.apache.org/r1596202
Log:
TOMEE-1217 toUrl in PerisstenceUnitInfoImpl can create weird url when file is not a file but a jar link

Modified:
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java?rev=1596202&r1=1596201&r2=1596202&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java Tue May 20 11:27:06 2014
@@ -250,6 +250,13 @@ public class PersistenceUnitInfoImpl imp
     }
 
     private URL toUrl(final File root) throws MalformedURLException {
+        if (!root.isFile() && root.getPath().startsWith("jar:file:")) {
+            try {
+                return new URL(root.getPath());
+            } catch (final MalformedURLException me) {
+                // no-op keep previous behavior
+            }
+        }
         return root.toURI().toURL();
     }