Repository: camel Updated Branches: refs/heads/master cbbebf771 -> 4d62cc71d
Polished Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/47a60641 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/47a60641 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/47a60641 Branch: refs/heads/master Commit: 47a6064170ac60e7df3e7eae588f2413aae31b0d Parents: cbbebf7 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue May 30 16:17:59 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue May 30 16:17:59 2017 +0200 ---------------------------------------------------------------------- .../boot/FatJarPackageScanClassResolver.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/47a60641/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java index 83091ba..4f78de6 100644 --- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java +++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java @@ -32,9 +32,9 @@ import org.apache.camel.util.IOHelper; */ public class FatJarPackageScanClassResolver extends DefaultPackageScanClassResolver { - private static final String SPRINGBOOT_CLASSIC_LIB_ROOT = "lib/"; - private static final String SPRINGBOOT_BOOT_INF_LIB_ROOT = "BOOT-INF/lib/"; - private static final String SPRINGBOOT_BOOT_INF_CLASSES_ROOT = "BOOT-INF/classes/"; + private static final String SPRING_BOOT_CLASSIC_LIB_ROOT = "lib/"; + private static final String SPRING_BOOT_BOOT_INF_LIB_ROOT = "BOOT-INF/lib/"; + private static final String SPRING_BOOT_BOOT_INF_CLASSES_ROOT = "BOOT-INF/classes/"; /** * Loads all the class entries from the main JAR and all nested jars. @@ -63,7 +63,7 @@ public class FatJarPackageScanClassResolver extends DefaultPackageScanClassResol name = name.trim(); if (!entry.isDirectory() && name.endsWith(".class")) { entries.add(cleanupSpringbootClassName(name)); - } else if (inspectNestedJars && !entry.isDirectory() && isSpringbootNestedJar(name)) { + } else if (inspectNestedJars && !entry.isDirectory() && isSpringBootNestedJar(name)) { String nestedUrl = urlPath + "!/" + name; log.trace("Inspecting nested jar: {}", nestedUrl); @@ -73,7 +73,7 @@ public class FatJarPackageScanClassResolver extends DefaultPackageScanClassResol } } } catch (IOException ioe) { - log.warn("Cannot search jar file '" + urlPath + " due to an IOException: " + ioe.getMessage(), ioe); + log.warn("Cannot search jar file '" + urlPath + " due to an IOException: " + ioe.getMessage() + ". This exception is ignored.", ioe); } finally { if (closeStream) { // stream is left open when scanning nested jars, otherwise the fat jar stream gets closed @@ -84,15 +84,15 @@ public class FatJarPackageScanClassResolver extends DefaultPackageScanClassResol return entries; } - private boolean isSpringbootNestedJar(String name) { + private boolean isSpringBootNestedJar(String name) { // Supporting both versions of the packaging model - return name.endsWith(".jar") && (name.startsWith(SPRINGBOOT_CLASSIC_LIB_ROOT) || name.startsWith(SPRINGBOOT_BOOT_INF_LIB_ROOT)); + return name.endsWith(".jar") && (name.startsWith(SPRING_BOOT_CLASSIC_LIB_ROOT) || name.startsWith(SPRING_BOOT_BOOT_INF_LIB_ROOT)); } private String cleanupSpringbootClassName(String name) { // Classes inside BOOT-INF/classes will be loaded by the new classloader as if they were in the root - if (name.startsWith(SPRINGBOOT_BOOT_INF_CLASSES_ROOT)) { - name = name.substring(SPRINGBOOT_BOOT_INF_CLASSES_ROOT.length()); + if (name.startsWith(SPRING_BOOT_BOOT_INF_CLASSES_ROOT)) { + name = name.substring(SPRING_BOOT_BOOT_INF_CLASSES_ROOT.length()); } return name; }
