Skip to content

Fix: Reduce thread blocking by double null check instead of synchronizing on Method object #521

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

Merged
lukaszlenart merged 2 commits into from
Dec 29, 2025
Merged

Fix: Reduce thread blocking by double null check instead of synchronizing on Method object #521

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6de130
feat: OgnlRuntime#invokeMethod double null check to avoid synchronizi…
fanzhongwei Dec 29, 2025
f4d23af
fix: Move the assignment of syncInvoke to out of the if/else block.
fanzhongwei Dec 29, 2025
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
36 changes: 20 additions & 16 deletions ognl/src/main/java/ognl/OgnlRuntime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,29 +668,33 @@ public static Object invokeMethod(Object target, Method method, Object[] argsArr
}

// only synchronize method invocation if it actually requires it

synchronized (method) {
methodAccessCacheValue = _methodAccessCache.get(method);
if (methodAccessCacheValue == null) {
if (!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers())) {
var obj = Modifier.isStatic(method.getModifiers()) ? null : target;
if (method.canAccess(obj)) {
methodAccessCacheValue = Boolean.FALSE;
_methodAccessCache.put(method, methodAccessCacheValue);
methodAccessCacheValue = _methodAccessCache.get(method);
// double null check to avoid synchronizing on the method
if (methodAccessCacheValue == null) {
synchronized (method) {
methodAccessCacheValue = _methodAccessCache.get(method);
if (methodAccessCacheValue == null) {
if (!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers())) {
var obj = Modifier.isStatic(method.getModifiers()) ? null : target;
if (method.canAccess(obj)) {
methodAccessCacheValue = Boolean.FALSE;
_methodAccessCache.put(method, methodAccessCacheValue);
} else {
methodAccessCacheValue = Boolean.TRUE;
_methodAccessCache.put(method, methodAccessCacheValue);
}
} else {
methodAccessCacheValue = Boolean.TRUE;
methodAccessCacheValue = Boolean.FALSE;
_methodAccessCache.put(method, methodAccessCacheValue);
}
} else {
methodAccessCacheValue = Boolean.FALSE;
_methodAccessCache.put(method, methodAccessCacheValue);
}
}
syncInvoke = Boolean.TRUE.equals(methodAccessCacheValue);

_methodPermCache.putIfAbsent(method, Boolean.TRUE);
_methodPermCache.putIfAbsent(method, Boolean.TRUE);
}
}

syncInvoke = Boolean.TRUE.equals(methodAccessCacheValue);

Object result;

if (syncInvoke) //if is not public and is not accessible
Expand Down