Skip to content

Commit 8cfca0e

Browse files
vilmosnagyCroway
authored andcommitted
CAMEL-23370 fix camel.main.routes-include-pattern usage with multi-level wildcard matchers in springboot jars
Using `classpath:**/*.xml` (like any xml in any dir) was broken since _probably_ CAMEL-21944
1 parent 9e6d7d3 commit 8cfca0e

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

core/camel-support/src/main/java/org/apache/camel/support/scan/DefaultPackageScanResourceResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ protected void loadImplementationsInJar(
216216
boolean match = PATH_MATCHER.match(subPattern, shortName);
217217
LOG.debug("Found resource: {} matching pattern: {} -> {}", shortName, subPattern, match);
218218
if (match) {
219-
Resource resource = new PackageScanJarResource("jar", url, name);
219+
Resource resource = new PackageScanJarResource("jar", url, shortName);
220220
resources.add(resource);
221221
}
222222
}

core/camel-support/src/main/java/org/apache/camel/support/scan/PackageScanJarResource.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,15 @@
2525
import java.net.URLClassLoader;
2626

2727
import org.apache.camel.support.ResourceSupport;
28-
import org.apache.camel.util.FileUtil;
2928
import org.apache.camel.util.StringHelper;
3029

3130
public class PackageScanJarResource extends ResourceSupport {
3231

3332
private final URL url;
3433
private final URLClassLoader uc;
3534

36-
public PackageScanJarResource(String scheme, URL url, String location) {
37-
super(scheme, url.getFile() + FileUtil.stripPath(location));
35+
public PackageScanJarResource(String scheme, URL url, String shortName) {
36+
super(scheme, url.getFile() + shortName);
3837
this.url = url;
3938
this.uc = new URLClassLoader(new URL[] { url });
4039
}

0 commit comments

Comments
 (0)