Skip to content

Improve embedded Tomcat's Graal compatibility #18262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Improve embedded Tomcat's Graal compatibility #18262

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions ...in/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.apache.catalina.loader.ParallelWebappClassLoader;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.tomcat.util.compat.JreCompat;

/**
* Extension of Tomcat's {@link ParallelWebappClassLoader} that does not consider the
Expand All @@ -32,14 +33,17 @@
* executable archives).
*
* @author Phillip Webb
* @author Andy Clement
* @since 2.0.0
*/
public class TomcatEmbeddedWebappClassLoader extends ParallelWebappClassLoader {

private static final Log logger = LogFactory.getLog(TomcatEmbeddedWebappClassLoader.class);

static {
ClassLoader.registerAsParallelCapable();
if (!JreCompat.isGraalAvailable()) {
ClassLoader.registerAsParallelCapable();
}
}

public TomcatEmbeddedWebappClassLoader() {
Expand All @@ -61,7 +65,7 @@ public Enumeration<URL> findResources(String name) throws IOException {

@Override
public Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
synchronized (getClassLoadingLock(name)) {
synchronized (JreCompat.isGraalAvailable() ? this : getClassLoadingLock(name)) {
Class<?> result = findExistingLoadedClass(name);
result = (result != null) ? result : doLoadClass(name);
if (result == null) {
Expand All @@ -73,7 +77,7 @@ public Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundExce

private Class<?> findExistingLoadedClass(String name) {
Class<?> resultClass = findLoadedClass0(name);
resultClass = (resultClass != null) ? resultClass : findLoadedClass(name);
resultClass = (resultClass != null || JreCompat.isGraalAvailable()) ? resultClass : findLoadedClass(name);
return resultClass;
}

Expand Down