Author: remy.maucherat(a)jboss.com Date: 2010-11-23 04:44:33 -0500 (Tue, 23 Nov 2010) New Revision: 1582 Modified: trunk/java/org/apache/jasper/compiler/Compiler.java trunk/webapps/docs/changelog.xml Log: - 49726: Default content type should not override. Modified: trunk/java/org/apache/jasper/compiler/Compiler.java =================================================================== --- trunk/java/org/apache/jasper/compiler/Compiler.java 2010-11-23 09:34:25 UTC (rev 1581) +++ trunk/java/org/apache/jasper/compiler/Compiler.java 2010-11-23 09:44:33 UTC (rev 1582) @@ -139,9 +139,7 @@ pageInfo.setTrimDirectiveWhitespaces(JspUtil.booleanValue(jspProperty .isTrimDirectiveWhitespaces())); } - if (jspProperty.getDefaultContentType() != null && pageInfo.getContentType() == null) { - pageInfo.setContentType(jspProperty.getDefaultContentType()); - } + // Default ContentType processing is deferred until after the page has been parsed if (jspProperty.getBuffer() != null && pageInfo.getBufferValue() == null) { pageInfo.setBufferValue(jspProperty.getBuffer(), errDispatcher); } @@ -195,6 +193,10 @@ // Pass 2 - the whole translation unit pageNodes = parserCtl.parse(ctxt.getJspFile()); + if (jspProperty.getDefaultContentType() != null && pageInfo.getContentType() == null) { + pageInfo.setContentType(jspProperty.getDefaultContentType()); + } + if (ctxt.isPrototypeMode()) { // generate prototype .java file for the tag file writer = setupContextWriter(javaFileName); Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2010-11-23 09:34:25 UTC (rev 1581) +++ trunk/webapps/docs/changelog.xml 2010-11-23 09:44:33 UTC (rev 1582) @@ -49,6 +49,10 @@ <fix> <bug>49555</bug>: Fix use of static inner classes in taglibs. (markt) </fix> + <fix> + <bug>49726</bug>: Specifying a default content type via a JSP property group + should not prevent a page from setting some other content type. (markt) + </fix> </changelog> </subsection> </section>