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 2014/10/02 11:37:46 UTC

svn commit: r1628913 - /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java

Author: rmannibucau
Date: Thu Oct  2 09:37:45 2014
New Revision: 1628913

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

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

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1628913&r1=1628912&r2=1628913&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Thu Oct  2 09:37:45 2014
@@ -1990,7 +1990,7 @@ public class Assembler extends Assembler
             final Collection<File> urls = new HashSet<>();
             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);
@@ -2001,7 +2001,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;
                         if (logger.isDebugEnabled()) {
                             logger.debug(url.toExternalForm() + " (" + URLs.toFile(url)