commit 57cb87f6fe45fb0f7fc43f557271da4ffee1cacf
author Romain Manni-Bucau <rmannibucau@apache.org> Sun May 17 23:05:59 2015 +0200
committer Jonathan Gallimore <jon@jrg.me.uk> Sun May 17 22:36:53 2015 +0100
tree f22640774e13410e18127f0b33bc54fd59fcd478
parent 39fe3a03620fe01b7ab17b0e256d0e0c1239658e

TOMEE-1580 correct computing of jarFilesUrl

container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java

diff --git a/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
index 5883af4..c849ad6 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
@@ -250,11 +250,17 @@
 
         this.persistenceUnitRootUrl = toUrl(root);
         try {
+            if (!jarFiles.isEmpty()) {
+                final File tmpRoot;
+                if (root.getName().endsWith(".jar")) {
+                    tmpRoot = root.getParentFile(); // lib for a war, / of the ear otherwise, no sense in other cases
+                } else {
+                    tmpRoot = root;
+                }
 
-            for (final String path : jarFiles) {
-                File file = new File(root, path);
-                file = file.getCanonicalFile();
-                jarFileUrls.add(toUrl(file));
+                for (final String path : jarFiles) {
+                    jarFileUrls.add(toUrl(new File(tmpRoot, path).getCanonicalFile()));
+                }
             }
         } catch (final IOException e) {
             throw new IllegalStateException(e);