joerg 2003/07/12 07:57:49
Modified: src/java/org/apache/cocoon/reading JSPReader.java
Log:
applied latest changes from 2.1:
revert encoding changes in JSPEngineImpl (bug 14327)
made JSPs working in Resin not ending on .jsp (bug 4934, thanks to Ryder
Rishel)
avoid NPE in JSPEngineImplNamedDispatcherInclude if no RequestDispatcher was
found
deprecation messages added
Revision Changes Path
1.2 +4 -3
cocoon-2.0/src/java/org/apache/cocoon/reading/JSPReader.java
Index: JSPReader.java
===================================================================
RCS file:
/home/cvs/cocoon-2.0/src/java/org/apache/cocoon/reading/JSPReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JSPReader.java 9 Mar 2003 00:03:07 -0000 1.1
+++ JSPReader.java 12 Jul 2003 14:57:49 -0000 1.2
@@ -103,7 +103,7 @@
JSPEngine engine = null;
try {
- // FIXME (KP): Should we exclude not supported protocols, say
'context'?
+ // TODO (KP): Should we exclude not supported protocols, say
'context'?
String url = this.source;
// absolute path is processed as is
@@ -120,10 +120,11 @@
getLogger().debug("JSPReader executing JSP:" + url);
byte[] bytes = engine.executeJSP(url, httpRequest, httpResponse,
httpContext);
- // FIXME (KP): Make buffer size configurable
+ // TODO (KP): Make buffer size configurable
byte[] buffer = new byte[8192];
int length = -1;
+ // TODO: Recode from UTF8 to desired output encoding.
ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
while ((length = bais.read(buffer)) > -1) {
out.write(buffer, 0, length);
