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 2015/05/17 23:06:09 UTC
tomee git commit: TOMEE-1580 correct computing of jarFilesUrl
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 166d71c6d -> 863c1ac11
TOMEE-1580 correct computing of jarFilesUrl
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/863c1ac1
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/863c1ac1
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/863c1ac1
Branch: refs/heads/tomee-1.7.x
Commit: 863c1ac119309e6ba54d528c8b1594144e26557d
Parents: 166d71c
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Sun May 17 23:05:59 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Sun May 17 23:05:59 2015 +0200
----------------------------------------------------------------------
.../openejb/persistence/PersistenceUnitInfoImpl.java | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/863c1ac1/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 @@ public class PersistenceUnitInfoImpl implements PersistenceUnitInfo {
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);