myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu4...@apache.org
Subject svn commit: r1208766 - /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
Date Wed, 30 Nov 2011 20:42:12 GMT
Author: lu4242
Date: Wed Nov 30 20:42:11 2011
New Revision: 1208766

URL: http://svn.apache.org/viewvc?rev=1208766&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/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java?rev=1208766&r1=1208765&r2=1208766&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
Wed Nov 30 20:42:11 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);



Mime
View raw message