You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/11/30 21:42:26 UTC
svn commit: r1208767 -
/myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
Author: lu4242
Date: Wed Nov 30 20:42:25 2011
New Revision: 1208767
URL: http://svn.apache.org/viewvc?rev=1208767&view=rev
Log:
MYFACES-3412 updated AJAX values sometimes delete other elements (take into account always Accept header, even if it passed a contentTypeListString)
Modified:
myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
Modified: myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java?rev=1208767&r1=1208766&r2=1208767&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java Wed Nov 30 20:42:25 2011
@@ -246,9 +246,9 @@ public class HtmlRenderKitImpl extends R
ContentTypeUtils.XHTML_ALLOWED_CONTENT_TYPES);
}
- //2. If no passed contentTypeListString and no selectedContent
+ //2. If no selectedContentType
// try to derive it from accept header
- if (selectedContentType == null && contentTypeListString == null)
+ if (selectedContentType == null)
{
contentTypeListStringFromAccept =
ContentTypeUtils.getContentTypeFromAcceptHeader(facesContext);
@@ -284,7 +284,7 @@ public class HtmlRenderKitImpl extends R
}
}
- if (contentTypeListStringFromAccept != null)
+ if (selectedContentType == null && contentTypeListStringFromAccept != null)
{
String[] contentTypes = ContentTypeUtils.splitContentTypeListString(
contentTypeListStringFromAccept);