Skip to content
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

FISH-10136 Fix NPE in Payara Micro and Embedded #7065

Merged
merged 2 commits into from
Nov 27, 2024
Merged

FISH-10136 Fix NPE in Payara Micro and Embedded #7065

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dac70f4
FISH-10136 Add fallout for if field doesn't exist
Pandrex247 Nov 13, 2024
dc83a6a
FISH-10136 Remove now redundant code
Pandrex247 Nov 26, 2024
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
56 changes: 0 additions & 56 deletions appserver/web/war-util/src/main/java/org/glassfish/web/loader/WebappClassLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2051,7 +2051,6 @@ public void stop() throws Exception {
// START SJSAS 6258619
ClassLoaderUtil.releaseLoader(this);
// END SJSAS 6258619
clearBeanELResolverCache();
clearJaxRSCache();

synchronized(jarFilesLock) {
Expand Down Expand Up @@ -2659,61 +2658,6 @@ private void clearReferencesRmiTargets() {
}
}

private void clearBeanELResolverCache() {
try {
Class<?> elUtilsClass = CachingReflectionUtil.getClassFromCache("com.sun.faces.el.ELUtils", this);
if (elUtilsClass != null) {
clearBeanResolver(elUtilsClass);
}
} catch (Exception e) {
logger.log(Level.WARNING, "Error clearing BeanELResolver cache", e);
}
}

private void clearBeanResolver(Class<?> elUtilsClass) throws Exception {
Optional<Class<?>> elResolverClass = Optional.ofNullable(CachingReflectionUtil
.getClassFromCache("jakarta.el.BeanELResolver", this));
Object resolver = CachingReflectionUtil.getFieldFromCache(elUtilsClass, "BEAN_RESOLVER",
false).get(null);
if (resolver != null && elResolverClass.isPresent()) {
logger.fine(String.format("Fields: %s", Arrays.stream(elResolverClass.get().getDeclaredFields())
.map(Field::toString).collect(Collectors.toList())));
Method clearPropertiesMethod = CachingReflectionUtil.getMethodFromCache(elResolverClass.get(),
"clearProperties", false, ClassLoader.class);
if (clearPropertiesMethod != null) {
clearPropertiesMethod.invoke(resolver, this);
} else {
clearBeanELResolverPropertiesCache(resolver, elResolverClass.get());
}
} else {
logger.warning("BeanELResolver not found");
}
}

/**
* Workaround until clearProperties() is available in Jakarta EL
* @see <a href="https://github.com/jakartaee/expression-language/pull/215">Jakarta EL Pull Request</a>
*/
private void clearBeanELResolverPropertiesCache(Object resolver, Class<?> elResolverClass) throws Exception {
Optional<Class<?>> elResolverCacheClass = Optional.ofNullable(CachingReflectionUtil
.getClassFromCache("jakarta.el.BeanELResolver$SoftConcurrentHashMap", this));
var propertiesField = Optional.ofNullable(CachingReflectionUtil
.getFieldFromCache(elResolverClass, "properties", true));
@SuppressWarnings("unchecked")
ConcurrentHashMap<Class<?>, Object> properties =
(ConcurrentHashMap<Class<?>, Object>) propertiesField.get().get(resolver);
properties.entrySet().removeIf(entry -> entry.getKey().getClassLoader() == this);
var mapField = Optional.ofNullable(CachingReflectionUtil
.getFieldFromCache(elResolverCacheClass.get(), "map", true));
@SuppressWarnings("unchecked")
ConcurrentHashMap<Class<?>, Object> map =
(ConcurrentHashMap<Class<?>, Object>) mapField.get().get(propertiesField.get().get(resolver));
map.entrySet().removeIf(entry -> entry.getKey().getClassLoader() == this);
var cleanupMethod = Optional.ofNullable(CachingReflectionUtil
.getMethodFromCache(elResolverCacheClass.get(), "cleanup", true));
cleanupMethod.get().invoke(propertiesField.get().get(resolver));
}

private void clearJaxRSCache() {
try {
Class<?> cdiComponentProvider = CachingReflectionUtil
Expand Down