From ed46c7920d232d5cbee18f489acce73c346a00a6 Mon Sep 17 00:00:00 2001 From: Conor MacNeill Date: Sat, 7 Jul 2001 13:54:40 +0000 Subject: [PATCH] AntClassLoader now ignores paths which are invalid relative to the project. PR: 381 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269287 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/tools/ant/AntClassLoader.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/main/org/apache/tools/ant/AntClassLoader.java b/src/main/org/apache/tools/ant/AntClassLoader.java index b54e166ab..6c844a742 100644 --- a/src/main/org/apache/tools/ant/AntClassLoader.java +++ b/src/main/org/apache/tools/ant/AntClassLoader.java @@ -394,7 +394,7 @@ public class AntClassLoader extends ClassLoader { File pathComponent = project.resolveFile((String)pathElements[i]); stream = getResourceStream(pathComponent, name); } - catch {BuildException e) { + catch (BuildException e) { // ignore path elements which are invalid relative to the project } } @@ -525,8 +525,13 @@ public class AntClassLoader extends ClassLoader { if (url == null) { String[] pathElements = classpath.list(); for (int i = 0; i < pathElements.length && url == null; ++i) { - File pathComponent = project.resolveFile((String)pathElements[i]); - url = getResourceURL(pathComponent, name); + try { + File pathComponent = project.resolveFile((String)pathElements[i]); + url = getResourceURL(pathComponent, name); + } + catch (BuildException e) { + // ignore path elements which ar einvalid relative to the project + } } } @@ -757,8 +762,13 @@ public class AntClassLoader extends ClassLoader { try { String[] pathElements = path.list(); for (int i = 0; i < pathElements.length && stream == null; ++i) { - File pathComponent = project.resolveFile((String)pathElements[i]); - stream = getResourceStream(pathComponent, classFilename); + try { + File pathComponent = project.resolveFile((String)pathElements[i]); + stream = getResourceStream(pathComponent, classFilename); + } + catch (BuildException e) { + // ignore invalid paths + } } if (stream == null) {