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

Jump to bottom

Obtain ELContextImpl correctly when using the security manager #48

Merged
merged 1 commit into from
May 7, 2022
Merged

Obtain ELContextImpl correctly when using the security manager #48

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
11 changes: 6 additions & 5 deletions src/main/java/org/glassfish/wasp/runtime/PageContextImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,11 +914,12 @@ public static Object evaluateExpression(final String expression, final Class<?>
if (SecurityUtil.isPackageProtectionEnabled()) {
try {
retValue = AccessController.doPrivileged((PrivilegedExceptionAction<Object>) () -> {
ELContextImpl elContext = (ELContextImpl) pageContext.getELContext();
elContext.setFunctionMapper(functionMap);
ExpressionFactory expFactory = getExpressionFactory(pageContext);
ValueExpression expr = expFactory.createValueExpression(elContext, expression, expectedType);
return expr.getValue(elContext);
ELContext elContext = pageContext.getELContext();
toELContextImpl(elContext).setFunctionMapper(functionMap);

return getExpressionFactory(pageContext)
.createValueExpression(elContext, expression, expectedType)
.getValue(elContext);
});
} catch (PrivilegedActionException ex) {
Exception realEx = ex.getException();
Expand Down