Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-12.0.x-8447-remove-ELContextCleaner-ee10' into jetty-12.0.x

This commit is contained in:
Jan Bartel 2022-08-12 08:23:09 +10:00
parent 95af780d17 4475537339
commit 52f1c91cca
2 changed files with 0 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/listener/ELContextCleaner.java
View File

@ -1,113 +0,0 @@
//
// ========================================================================
// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others.
//
// This program and the accompanying materials are made available under the
// terms of the Eclipse Public License v. 2.0 which is available at
// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
// which is available at https://www.apache.org/licenses/LICENSE-2.0.
//
// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
// ========================================================================
//
package org.eclipse.jetty.ee10.servlet.listener;
import java.lang.reflect.Field;
import java.util.Iterator;
import java.util.Map;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener;
import org.eclipse.jetty.util.Loader;
/**
* ELContextCleaner
*
* Clean up BeanELResolver when the context is going out
* of service:
*
* See http://java.net/jira/browse/GLASSFISH-1649
* See https://bugs.eclipse.org/bugs/show_bug.cgi?id=353095
*/
public class ELContextCleaner implements ServletContextListener
{
// IMPORTANT: This class cannot have a slf4j Logger
// As it will force this requirement on webapps.
// private static final Logger LOG = LoggerFactory.getLogger(ELContextCleaner.class);
@Override
public void contextInitialized(ServletContextEvent sce)
{
}
@Override
public void contextDestroyed(ServletContextEvent sce)
{
try
{
//Check that the BeanELResolver class is on the classpath
Class<?> beanELResolver = Loader.loadClass("jakarta.el.BeanELResolver");
//Get a reference via reflection to the properties field which is holding class references
Field field = getField(beanELResolver);
field.setAccessible(true);
//Get rid of references
purgeEntries(sce.getServletContext(), field);
}
catch (ClassNotFoundException e)
{
//BeanELResolver not on classpath, ignore
}
catch (SecurityException | IllegalArgumentException | IllegalAccessException e)
{
sce.getServletContext().log("Cannot purge classes from javax.el.BeanELResolver", e);
}
catch (NoSuchFieldException e)
{
sce.getServletContext().log("Not cleaning cached beans: no such field javax.el.BeanELResolver.properties");
}
}
protected Field getField(Class<?> beanELResolver)
throws SecurityException, NoSuchFieldException
{
if (beanELResolver == null)
return null;
return beanELResolver.getDeclaredField("properties");
}
@SuppressWarnings({"rawtypes", "unchecked"})
protected void purgeEntries(ServletContext context, Field properties)
throws IllegalArgumentException, IllegalAccessException
{
if (properties == null)
return;
Map map = (Map)properties.get(null);
if (map == null)
return;
Iterator<Class<?>> itor = map.keySet().iterator();
while (itor.hasNext())
{
Class<?> clazz = itor.next();
context.log(String.format("Clazz: %s loaded by %s", clazz, clazz.getClassLoader()));
if (Thread.currentThread().getContextClassLoader().equals(clazz.getClassLoader()))
{
itor.remove();
context.log("removed");
}
else
{
context.log(String.format("not removed: contextClassLoader=%s class's classLoader=%s",
Thread.currentThread().getContextClassLoader(), clazz.getClassLoader()));
}
}
}
}

8
jetty-ee10/jetty-ee10-webapp/src/main/config/etc/webdefault-ee10.xml
View File

@ -29,14 +29,6 @@
This file is applied to a Web application before its own WEB_INF/web.xml file
</description>
<!-- ==================================================================== -->
<!-- Removes static references to beans from javax.el.BeanELResolver to -->
<!-- ensure webapp classloader can be released on undeploy -->
<!-- ==================================================================== -->
<listener>
<listener-class>org.eclipse.jetty.ee10.servlet.listener.ELContextCleaner</listener-class>
</listener>
<!-- ==================================================================== -->
<!-- Removes static cache of Methods from java.beans.Introspector to -->
<!-- ensure webapp classloader can be released on undeploy -->