joerg 2003/07/12 07:58:00
Modified: src/java/org/apache/cocoon/generation JspGenerator.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 +2 -2
cocoon-2.0/src/java/org/apache/cocoon/generation/JspGenerator.java
Index: JspGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.0/src/java/org/apache/cocoon/generation/JspGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JspGenerator.java 9 Mar 2003 00:02:59 -0000 1.1
+++ JspGenerator.java 12 Jul 2003 14:58:00 -0000 1.2
@@ -122,7 +122,7 @@
// explicitly specify bytestream encoding
InputSource input = new InputSource(new
ByteArrayInputStream(bytes));
- // FIXME (KP): Why do we need this?
+ // utf-8 is default encoding; specified explicitely here as a
reminder.
input.setEncoding("utf-8");
// pipe the results into the parser
