[richfaces-svn-commits] JBoss Rich Faces SVN: r15019 - branches/community/3.3.X/ui/layout/src/main/java/org/richfaces/renderkit.
Author: alexsmirnov
Date: 2009-07-27 20:32:59 -0400 (Mon, 27 Jul 2009)
New Revision: 15019
Modified:
branches/community/3.3.X/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java
Log:
https://jira.jboss.org/jira/browse/RF-7367
Modified:
branches/community/3.3.X/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java
===================================================================
---
branches/community/3.3.X/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java 2009-07-28
00:21:54 UTC (rev 15018)
+++
branches/community/3.3.X/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java 2009-07-28
00:32:59 UTC (rev 15019)
@@ -79,8 +79,8 @@
ResponseWriter out = context.getResponseWriter();
Map<String, Object> attributes = component.getAttributes();
String format = (String) attributes.get("markupType");
- String contentType = null;
- String namespace = null;
+ String contentType = (String) attributes.get("contentType");
+ String namespace = (String) attributes.get("namespace");
// String characterEncoding = out.getCharacterEncoding();
String[] docType = null;
if (null != format) {
@@ -97,13 +97,15 @@
}
}
if (null != docType) {
- contentType = docType[1];
- namespace = docType[2];
+ if (null == contentType) {
+ contentType = docType[1];
+ }
+ // https://jira.jboss.org/jira/browse/RF-7367
+ if (null == namespace) {
+ namespace = docType[2];
+ }
out.write(docType[0]);
}
- if (null == contentType) {
- contentType = (String) attributes.get("contentType");
- }
if (null != contentType) {
// response.setContentType(contentType /*+ ";charset=" +
// characterEncoding*/);