Author: rmannibucau
Date: Thu Oct  2 09:38:36 2014
New Revision: 1628914

URL: http://svn.apache.org/r1628914
Log:
using CanonicalFile when trying to skip app loader

Modified:
    
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java

Modified: 
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1628914&r1=1628913&r2=1628914&view=diff
==============================================================================
--- 
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 (original)
+++ 
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 Thu Oct  2 09:38:36 2014
@@ -1946,7 +1946,7 @@ public class Assembler extends Assembler
             final Collection<File> urls = new ArrayList<File>();
             for (final URL url : ClassLoaders.findUrls(parent)) { // need to 
convert it to file since urls can be file:/xxx or jar:file:///xxx
                 try {
-                    urls.add(URLs.toFile(url));
+                    urls.add(URLs.toFile(url).getCanonicalFile());
                 } catch (final Exception error) {
                     if (logger.isDebugEnabled()) {
                         logger.debug("Can't determine url for: " + 
url.toExternalForm(), error);
@@ -1957,7 +1957,7 @@ public class Assembler extends Assembler
             boolean allIsIntheClasspath = true;
             for (final URL url : filtered) {
                 try {
-                    if (!urls.contains(URLs.toFile(url))) {
+                    if (!urls.contains(URLs.toFile(url).getCanonicalFile())) {
                         allIsIntheClasspath = false;
                         break;
                     }


Reply via email to