Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 15:46:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "WN-5141"

Browse Source 
This reverts commit 5d1aa6edcf.
This commit is contained in:
jdyer1
2023-10-30 13:29:12 -05:00
committed by Lukasz Lenart
parent 380b157bef
commit bbdeb2d459
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ELResolverImpl.java
+6
View File
@@ -18,6 +18,8 @@
*/
package org.apache.struts2.jasper.el;
import java.util.Iterator;
import jakarta.el.ArrayELResolver;
import jakarta.el.BeanELResolver;
import jakarta.el.CompositeELResolver;
@@ -131,6 +133,10 @@ public final class ELResolverImpl extends ELResolver {
return DefaultResolver.isReadOnly(context, base, property);
}
public Iterator<java.beans.FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
return DefaultResolver.getFeatureDescriptors(context, base);
}
public Class<?> getCommonPropertyType(ELContext context, Object base) {
if (base == null) {
return String.class;
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspContextWrapper.java
+8 -3
View File
@@ -26,9 +26,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import org.apache.struts2.jasper.compiler.Localizer;
import org.apache.struts2.jasper.util.Enumerator;
import jakarta.el.ELContext;
import jakarta.servlet.Servlet;
import jakarta.servlet.ServletConfig;
@@ -41,10 +38,14 @@ import jakarta.servlet.jsp.JspContext;
import jakarta.servlet.jsp.JspWriter;
import jakarta.servlet.jsp.PageContext;
import jakarta.servlet.jsp.el.ELException;
import jakarta.servlet.jsp.el.ExpressionEvaluator;
import jakarta.servlet.jsp.el.VariableResolver;
import jakarta.servlet.jsp.tagext.BodyContent;
import jakarta.servlet.jsp.tagext.VariableInfo;
import org.apache.struts2.jasper.compiler.Localizer;
import org.apache.struts2.jasper.util.Enumerator;
/**
* Implementation of a JSP Context Wrapper.
*
@@ -295,6 +296,10 @@ public class JspContextWrapper extends PageContext implements VariableResolver {
return invokingJspCtxt.popBody();
}
public ExpressionEvaluator getExpressionEvaluator() {
return invokingJspCtxt.getExpressionEvaluator();
}
public void handlePageException(Exception ex) throws IOException,
ServletException {
// Should never be called since handleException() called with a