You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@myfaces.apache.org by pa...@apache.org on 2017/12/23 11:59:17 UTC

svn commit: r1819140 - /myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/util/FaceletsViewDeclarationLanguageUtils.java

Author: paulnicolucci
Date: Sat Dec 23 11:59:17 2017
New Revision: 1819140

URL: http://svn.apache.org/viewvc?rev=1819140&view=rev
Log:
MYFACES-4184 avoid NPE

Modified:
    myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/util/FaceletsViewDeclarationLanguageUtils.java

Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/util/FaceletsViewDeclarationLanguageUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/util/FaceletsViewDeclarationLanguageUtils.java?rev=1819140&r1=1819139&r2=1819140&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/util/FaceletsViewDeclarationLanguageUtils.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/util/FaceletsViewDeclarationLanguageUtils.java Sat Dec 23 11:59:17 2017
@@ -111,7 +111,7 @@ public class FaceletsViewDeclarationLang
      */
     public static void markRenderedResources(FacesContext facesContext, UIViewRoot view)
     {
-        if (facesContext.getPartialViewContext().isAjaxRequest())
+        if (view != null && facesContext.getPartialViewContext().isAjaxRequest())
         {
             markRenderedResources(facesContext, view, view.getComponentResources(facesContext, "head"));
             markRenderedResources(facesContext, view, view.getComponentResources(facesContext, "body"));