|
Lines 124-129
Link Here
|
| 124 |
private GenBuffer charArrayBuffer; |
124 |
private GenBuffer charArrayBuffer; |
| 125 |
|
125 |
|
| 126 |
private final DateFormat timestampFormat; |
126 |
private final DateFormat timestampFormat; |
|
|
127 |
|
| 128 |
private ELInterpreter elInterpreter; |
| 127 |
|
129 |
|
| 128 |
/** |
130 |
/** |
| 129 |
* @param s |
131 |
* @param s |
|
Lines 831-837
Link Here
|
| 831 |
} |
833 |
} |
| 832 |
return v; |
834 |
return v; |
| 833 |
} else if (attr.isELInterpreterInput()) { |
835 |
} else if (attr.isELInterpreterInput()) { |
| 834 |
v = JspUtil.interpreterCall(this.isTagFile, v, expectedType, |
836 |
v = elInterpreter.interpreterCall(ctxt, this.isTagFile, v, expectedType, |
| 835 |
attr.getEL().getMapName(), false); |
837 |
attr.getEL().getMapName(), false); |
| 836 |
if (encode) { |
838 |
if (encode) { |
| 837 |
return "org.apache.jasper.runtime.JspRuntimeLibrary.URLEncode(" |
839 |
return "org.apache.jasper.runtime.JspRuntimeLibrary.URLEncode(" |
|
Lines 917-923
Link Here
|
| 917 |
n.setBeginJavaLine(out.getJavaLine()); |
919 |
n.setBeginJavaLine(out.getJavaLine()); |
| 918 |
if (!pageInfo.isELIgnored() && (n.getEL() != null)) { |
920 |
if (!pageInfo.isELIgnored() && (n.getEL() != null)) { |
| 919 |
out.printil("out.write(" |
921 |
out.printil("out.write(" |
| 920 |
+ JspUtil.interpreterCall(this.isTagFile, n.getType() + |
922 |
+ elInterpreter.interpreterCall(ctxt, this.isTagFile, n.getType() + |
| 921 |
"{" + n.getText() + "}", String.class, |
923 |
"{" + n.getText() + "}", String.class, |
| 922 |
n.getEL().getMapName(), false) + ");"); |
924 |
n.getEL().getMapName(), false) + ");"); |
| 923 |
} else { |
925 |
} else { |
|
Lines 2977-2983
Link Here
|
| 2977 |
// run attrValue through the expression interpreter |
2979 |
// run attrValue through the expression interpreter |
| 2978 |
String mapName = (attr.getEL() != null) ? attr.getEL() |
2980 |
String mapName = (attr.getEL() != null) ? attr.getEL() |
| 2979 |
.getMapName() : null; |
2981 |
.getMapName() : null; |
| 2980 |
attrValue = JspUtil.interpreterCall(this.isTagFile, attrValue, |
2982 |
attrValue = elInterpreter.interpreterCall(ctxt, this.isTagFile, attrValue, |
| 2981 |
c[0], mapName, false); |
2983 |
c[0], mapName, false); |
| 2982 |
} |
2984 |
} |
| 2983 |
} else { |
2985 |
} else { |
|
Lines 3424-3430
Link Here
|
| 3424 |
ctxt = compiler.getCompilationContext(); |
3426 |
ctxt = compiler.getCompilationContext(); |
| 3425 |
fragmentHelperClass = new FragmentHelperClass("Helper"); |
3427 |
fragmentHelperClass = new FragmentHelperClass("Helper"); |
| 3426 |
pageInfo = compiler.getPageInfo(); |
3428 |
pageInfo = compiler.getPageInfo(); |
| 3427 |
|
3429 |
elInterpreter = ELInterpreterFactory.getELInterpreter(compiler.getCompilationContext().getServletContext()); |
|
|
3430 |
|
| 3428 |
/* |
3431 |
/* |
| 3429 |
* Temporary hack. If a JSP page uses the "extends" attribute of the |
3432 |
* Temporary hack. If a JSP page uses the "extends" attribute of the |
| 3430 |
* page directive, the _jspInit() method of the generated servlet class |
3433 |
* page directive, the _jspInit() method of the generated servlet class |