diff options
| author | Stuart McCulloch | 2015-09-10 19:11:50 +0000 |
|---|---|---|
| committer | Stuart McCulloch | 2015-09-10 19:12:45 +0000 |
| commit | 8fd4e5a65de9fdd5c630430e683c0b67fc866a75 (patch) | |
| tree | 75a11d3de54e96b6efd097eefea55b0dec75aedb | |
| parent | c266d2d9870ee1ed8a575f4b6234b5247038844d (diff) | |
| download | org.eclipse.sisu.inject-8fd4e5a65de9fdd5c630430e683c0b67fc866a75.tar.gz org.eclipse.sisu.inject-8fd4e5a65de9fdd5c630430e683c0b67fc866a75.tar.xz org.eclipse.sisu.inject-8fd4e5a65de9fdd5c630430e683c0b67fc866a75.zip | |
Address sonar comments
| -rw-r--r-- | org.eclipse.sisu.inject/src/org/eclipse/sisu/space/URLClassSpace.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/URLClassSpace.java b/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/URLClassSpace.java index 8d92230..336e4dc 100644 --- a/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/URLClassSpace.java +++ b/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/URLClassSpace.java @@ -173,13 +173,11 @@ public class URLClassSpace public final Enumeration<URL> findEntries( final String path, final String glob, final boolean recurse ) { - if ( null != SYSTEM_LOADER && loader == SYSTEM_LOADER && null == pathDetails ) + // short-circuit finding resources with fixed names from default system class-path + if ( null != SYSTEM_LOADER && loader == SYSTEM_LOADER && null == pathDetails // NOSONAR + && !recurse && null != glob && glob.indexOf( '*' ) < 0 ) { - // short-circuit finding resources with fixed names from default system class-path - if ( !recurse && null != glob && glob.indexOf( '*' ) < 0 ) - { - return getResources( ResourceEnumeration.normalizeSearchPath( path ) + glob ); - } + return getResources( ResourceEnumeration.normalizeSearchPath( path ) + glob ); } return new ResourceEnumeration( path, glob, recurse, getClassPath() ); } @@ -238,7 +236,7 @@ public class URLClassSpace break; } } - else if ( null != SYSTEM_LOADER && l == SYSTEM_LOADER ) + else if ( null != SYSTEM_LOADER && l == SYSTEM_LOADER ) // NOSONAR { classPath = expandClassPath( getSystemClassPath() ); break; |