You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2005/08/20 13:56:48 UTC
svn commit: r234023 -
/myfaces/impl/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
Author: mmarinschek
Date: Sat Aug 20 04:56:43 2005
New Revision: 234023
URL: http://svn.apache.org/viewcvs?rev=234023&view=rev
Log:
changed fix for render-kit encoding
Modified:
myfaces/impl/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
Modified: myfaces/impl/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java?rev=234023&r1=234022&r2=234023&view=diff
==============================================================================
--- myfaces/impl/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java (original)
+++ myfaces/impl/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java Sat Aug 20 04:56:43 2005
@@ -41,6 +41,7 @@
private static String XHTML_CONTENT_TYPE = "application/xhtml+xml";
private static String APPLICATION_XML_CONTENT_TYPE = "application/xml";
private static String TEXT_XML_CONTENT_TYPE = "text/xml";
+ private static String APPLICATION_WWW_FORM_URLENCODED_CONTENT_TYPE ="application/x-www-form-urlencoded";
private static String DEFAULT_CHAR_ENCODING = "ISO-8859-1";
@@ -106,7 +107,8 @@
List contentTypeList = splitContentTypeListString(contentTypeListString);
String[] supportedContentTypeArray = new String[]{HTML_CONTENT_TYPE,
- XHTML_CONTENT_TYPE,APPLICATION_XML_CONTENT_TYPE,TEXT_XML_CONTENT_TYPE};
+ XHTML_CONTENT_TYPE,APPLICATION_XML_CONTENT_TYPE,TEXT_XML_CONTENT_TYPE,
+ APPLICATION_WWW_FORM_URLENCODED_CONTENT_TYPE};
String selectedContentType = null;
@@ -120,7 +122,8 @@
if (contentType.indexOf(supportedContentType) != -1)
{
- if (contentType.indexOf(HTML_CONTENT_TYPE) != -1) {
+ if (contentType.indexOf(HTML_CONTENT_TYPE) != -1 ||
+ contentType.indexOf(APPLICATION_WWW_FORM_URLENCODED_CONTENT_TYPE) != -1) {
selectedContentType = HTML_CONTENT_TYPE;
}
else if (contentType.indexOf(XHTML_CONTENT_TYPE) != -1 ||
@@ -139,8 +142,10 @@
if(selectedContentType==null)
{
- throw new IllegalArgumentException("ContentTypeList does not contain a supported content type: " +
+ log.error("ContentTypeList does not contain a supported content type: " +
contentTypeListString);
+
+ selectedContentType = HTML_CONTENT_TYPE;
}
if(characterEncoding==null)