Author: rmannibucau Date: Sun May 25 19:01:37 2014 New Revision: 1597461 URL: http://svn.apache.org/r1597461 Log: if we filter an empty prefix then we filter all urls, regression introduced checking new tomcat property for exclusion which is empty by default
Modified: tomee/tomee/trunk/container/openejb-core/src/main/resources/default.exclusions tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java Modified: tomee/tomee/trunk/container/openejb-core/src/main/resources/default.exclusions URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/resources/default.exclusions?rev=1597461&r1=1597460&r2=1597461&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/resources/default.exclusions (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/resources/default.exclusions Sun May 25 19:01:37 2014 @@ -237,4 +237,4 @@ xmlschema- xmlsec- xmltooling- xmlunit- -ziplock- +ziplock- \ No newline at end of file Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java?rev=1597461&r1=1597460&r2=1597461&view=diff ============================================================================== --- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java (original) +++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java Sun May 25 19:01:37 2014 @@ -193,17 +193,23 @@ public class TomcatLoader implements Loa final Set<String> exclusions = new HashSet<String>(Arrays.asList(NewLoaderLogic.getExclusions())); { final String jarToSkipProp = CatalinaProperties.getProperty("tomcat.util.scan.DefaultJarScanner.jarsToSkip"); - if (jarToSkipProp != null) { + if (jarToSkipProp != null && !jarToSkipProp.isEmpty()) { for (final String s : jarToSkipProp.split(",")) { - exclusions.add(NewLoaderLogic.sanitize(s.trim())); + final String sanitize = NewLoaderLogic.sanitize(s.trim()); + if (!sanitize.isEmpty()) { + exclusions.add(sanitize); + } } } } { final String jarToSkipProp = CatalinaProperties.getProperty("org.apache.catalina.startup.ContextConfig.jarsToSkip"); - if (jarToSkipProp != null) { + if (jarToSkipProp != null && !jarToSkipProp.isEmpty()) { for (final String s : jarToSkipProp.split(",")) { - exclusions.add(NewLoaderLogic.sanitize(s.trim())); + final String sanitize = NewLoaderLogic.sanitize(s.trim()); + if (!sanitize.isEmpty()) { + exclusions.add(sanitize); + } } } }