kinman 2002/09/12 13:48:17
Modified: jasper2/src/share/org/apache/jasper/compiler
TagFileProcessor.java
jasper2/src/share/org/apache/jasper/runtime
JspContextWrapper.java
Log:
- pageInfo can be null if the page is not compiled.
- JspContextWrapper needs to implement VariableResolver interface.
Revision Changes Path
1.27 +7 -5
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagFileProcessor.java
Index: TagFileProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagFileProcessor.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- TagFileProcessor.java 11 Sep 2002 21:50:02 -0000 1.26
+++ TagFileProcessor.java 12 Sep 2002 20:48:17 -0000 1.27
@@ -387,9 +387,11 @@
// dependant list.
PageInfo pageInfo = wrapper.getJspEngineContext().getCompiler().
getPageInfo();
- Iterator iter = pageInfo.getDependants().iterator();
- if (iter.hasNext()) {
- parentPageInfo.addDependant((String)iter.next());
+ if (pageInfo != null) {
+ Iterator iter = pageInfo.getDependants().iterator();
+ if (iter.hasNext()) {
+ parentPageInfo.addDependant((String)iter.next());
+ }
}
return tagClass;
1.3 +20 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspContextWrapper.java
Index: JspContextWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspContextWrapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JspContextWrapper.java 19 Aug 2002 16:54:17 -0000 1.2
+++ JspContextWrapper.java 12 Sep 2002 20:48:17 -0000 1.3
@@ -79,6 +79,7 @@
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.BodyContent;
import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.el.ELException;
import javax.servlet.jsp.el.ExpressionEvaluator;
import javax.servlet.jsp.el.VariableResolver;
@@ -88,7 +89,7 @@
*
* @author Kin-man Chung
*/
-public class JspContextWrapper extends PageContext {
+public class JspContextWrapper extends PageContext implements VariableResolver {
private PageContext pageContext;
private transient Hashtable pageAttributes;
@@ -248,5 +249,20 @@
throws IOException, ServletException
{
pageContext.handlePageException(t);
+ }
+
+ /**
+ * VariableResolver interface
+ */
+ public Object resolveVariable( String pName, Object pContext )
+ throws ELException
+ {
+ if (pageContext instanceof PageContextImpl) {
+ return ((PageContextImpl)pageContext).
+ resolveVariable(pName, pContext);
+ }
+
+ return ((JspContextWrapper)pageContext).
+ resolveVariable(pName, pContext);
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
