You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2019/07/09 09:17:54 UTC

[tomee] branch master updated: TOMEE-2564 Classpath with :: on Linux is cause an infinite loop on War deploy

This is an automated email from the ASF dual-hosted git repository.

jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/master by this push:
     new c05053a  TOMEE-2564 Classpath with :: on Linux is cause an infinite loop on War deploy
     new 263e7bc  Merge pull request #506 from cbos/patch-1
c05053a is described below

commit c05053a91f9763707d785e65e22b1a6fd2b2053d
Author: Cees Bos <cb...@users.noreply.github.com>
AuthorDate: Mon Jul 8 11:46:30 2019 +0200

    TOMEE-2564 Classpath with :: on Linux is cause an infinite loop on War deploy
---
 .../src/main/java/org/apache/tomee/loader/TomEEJarScanner.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
index b76d91f..01cbd08 100644
--- a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
+++ b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
@@ -73,10 +73,12 @@ public class TomEEJarScanner extends StandardJarScanner {
             final String cp = System.getProperty("java.class.path");
             final Collection<URL> urls = new HashSet<>();
             for (final String jar : cp.split(File.pathSeparator)) {
-                try {
-                    urls.add(new File(jar).toURI().toURL());
-                } catch (MalformedURLException e) {
-                    // no-op
+                if(!jar.isEmpty()){
+                    try {
+                        urls.add(new File(jar).toURI().toURL());
+                    } catch (MalformedURLException e) {
+                        // no-op
+                    }
                 }
             }
             doScan(scanType, callback, new LinkedList<>(urls));