root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

ShadowingClassLoader can be constructed without default excludes 

Issue: SPR-15439
(cherry picked from commit 1735ba2)
This commit is contained in:
Juergen Hoeller 2017-04-12 15:34:50 +02:00
parent 54180f90e2
commit 80fa3ac907
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spring-context/src/main/java/org/springframework/instrument/classloading/ShadowingClassLoader.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -60,16 +60,30 @@ public class ShadowingClassLoader extends DecoratingClassLoader {
/** /**
* Create a new ShadowingClassLoader, decorating the given ClassLoader. * Create a new ShadowingClassLoader, decorating the given ClassLoader,
* applying {@link #DEFAULT_EXCLUDED_PACKAGES}.
* @param enclosingClassLoader the ClassLoader to decorate * @param enclosingClassLoader the ClassLoader to decorate
* @see #ShadowingClassLoader(ClassLoader, boolean)
*/ */
public ShadowingClassLoader(ClassLoader enclosingClassLoader) { public ShadowingClassLoader(ClassLoader enclosingClassLoader) {
this(enclosingClassLoader, true);
}
/**
* Create a new ShadowingClassLoader, decorating the given ClassLoader.
* @param enclosingClassLoader the ClassLoader to decorate
* @param defaultExcludes whether to apply {@link #DEFAULT_EXCLUDED_PACKAGES}
* @since 4.3.8
*/
public ShadowingClassLoader(ClassLoader enclosingClassLoader, boolean defaultExcludes) {
Assert.notNull(enclosingClassLoader, "Enclosing ClassLoader must not be null"); Assert.notNull(enclosingClassLoader, "Enclosing ClassLoader must not be null");
this.enclosingClassLoader = enclosingClassLoader; this.enclosingClassLoader = enclosingClassLoader;
if (defaultExcludes) {
for (String excludedPackage : DEFAULT_EXCLUDED_PACKAGES) { for (String excludedPackage : DEFAULT_EXCLUDED_PACKAGES) {
excludePackage(excludedPackage); excludePackage(excludedPackage);
} }
} }
}
/** /**