From 165aa1a60a4eadb09d99562a7f17fda5568c92e7 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 8 Feb 2021 13:02:48 -0600 Subject: [PATCH] Issue #5950 - remove WebAppClassLoader logging during loadClass Signed-off-by: Joakim Erdfelt --- .../org/eclipse/jetty/webapp/ClasspathPattern.java | 10 ++-------- .../org/eclipse/jetty/webapp/WebAppClassLoader.java | 11 ----------- .../java/org/eclipse/jetty/webapp/WebAppContext.java | 8 -------- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/ClasspathPattern.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/ClasspathPattern.java index 78c493331373..160181b06b73 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/ClasspathPattern.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/ClasspathPattern.java @@ -43,8 +43,6 @@ import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.TypeUtil; import org.eclipse.jetty.util.URIUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; /** @@ -69,8 +67,6 @@ public class ClasspathPattern extends AbstractSet { - private static final Logger LOG = Log.getLogger(ClasspathPattern.class); - static class Entry { private final String _pattern; @@ -697,9 +693,8 @@ public boolean match(Class clazz) { return combine(_packageOrNamePatterns, clazz.getName(), _locations, () -> TypeUtil.getLocationOfClass(clazz)); } - catch (Exception e) + catch (Exception ignored) { - LOG.warn(e); } return false; } @@ -719,9 +714,8 @@ public boolean match(String name, URL url) { return URIUtil.getJarSource(url.toURI()); } - catch (URISyntaxException e) + catch (URISyntaxException ignored) { - LOG.ignore(e); return null; } }); diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppClassLoader.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppClassLoader.java index 5d1116c5695d..10860f1b5246 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppClassLoader.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppClassLoader.java @@ -475,8 +475,6 @@ protected Class loadClass(String name, boolean resolve) throws ClassNotFoundE webappClass = findLoadedClass(name); if (webappClass != null) { - if (LOG.isDebugEnabled()) - LOG.debug("found webapp loaded {}", webappClass); return webappClass; } @@ -493,8 +491,6 @@ protected Class loadClass(String name, boolean resolve) throws ClassNotFoundE // If the webapp is allowed to see this class if (Boolean.TRUE.equals(__loadServerClasses.get()) || !_context.isServerClass(parentClass)) { - if (LOG.isDebugEnabled()) - LOG.debug("PLP parent loaded {}", parentClass); return parentClass; } } @@ -515,8 +511,6 @@ protected Class loadClass(String name, boolean resolve) throws ClassNotFoundE webappClass = this.findClass(name); if (resolve) resolveClass(webappClass); - if (LOG.isDebugEnabled()) - LOG.debug("PLP webapp loaded {}", webappClass); return webappClass; } catch (ClassNotFoundException e) @@ -545,8 +539,6 @@ else if (e != ex) // If the webapp is allowed to see this class if (Boolean.TRUE.equals(__loadServerClasses.get()) || !_context.isServerClass(parentClass)) { - if (LOG.isDebugEnabled()) - LOG.debug("WAP parent loaded {}", parentClass); return parentClass; } } @@ -655,9 +647,6 @@ protected Class foundClass(final String name, URL url) throws ClassNotFoundEx content = url.openStream(); byte[] bytes = IO.readBytes(content); - if (LOG.isDebugEnabled()) - LOG.debug("foundClass({}) url={} cl={}", name, url, this); - for (ClassFileTransformer transformer : _transformers) { byte[] tmp = transformer.transform(this, name, null, null, bytes); diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java index f2d6fc9411b8..add980457269 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java @@ -790,8 +790,6 @@ public boolean isServerClass(Class clazz) loadServerClasses(); boolean result = _serverClasses.match(clazz); - if (LOG.isDebugEnabled()) - LOG.debug("isServerClass=={} {}", result, clazz); return result; } @@ -802,8 +800,6 @@ public boolean isSystemClass(Class clazz) loadSystemClasses(); boolean result = _systemClasses.match(clazz); - if (LOG.isDebugEnabled()) - LOG.debug("isSystemClass=={} {}", result, clazz); return result; } @@ -814,8 +810,6 @@ public boolean isServerResource(String name, URL parentUrl) loadServerClasses(); boolean result = _serverClasses.match(name, parentUrl); - if (LOG.isDebugEnabled()) - LOG.debug("isServerResource=={} {} {}", result, name, parentUrl); return result; } @@ -826,8 +820,6 @@ public boolean isSystemResource(String name, URL webappUrl) loadSystemClasses(); boolean result = _systemClasses.match(name, webappUrl); - if (LOG.isDebugEnabled()) - LOG.debug("isSystemResource=={} {} {}", result, name, webappUrl); return result; }