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 2017/04/04 01:02:38 UTC

svn commit: r1790059 - in /myfaces/core/branches/2.3.x: impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java shared/src/main/java/org/apache/myfaces/shared/application/FacesServletMappingUtils.java

Author: lu4242
Date: Tue Apr  4 01:02:38 2017
New Revision: 1790059

URL: http://svn.apache.org/viewvc?rev=1790059&view=rev
Log:
small fixes for initialization of ViewDeclarationLanguageFactory and FacesServletMappingUtils

Modified:
    myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java
    myfaces/core/branches/2.3.x/shared/src/main/java/org/apache/myfaces/shared/application/FacesServletMappingUtils.java

Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java?rev=1790059&r1=1790058&r2=1790059&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java Tue Apr  4 01:02:38 2017
@@ -92,6 +92,11 @@ public class ViewDeclarationLanguageFact
     @Override
     public List<ViewDeclarationLanguage> getAllViewDeclarationLanguages()
     {
+        if (!_initialized)
+        {
+            initialize();
+        }
+        
         if (_supportedVDLs == null)
         {
             List<ViewDeclarationLanguage> list = new ArrayList<ViewDeclarationLanguage>();

Modified: myfaces/core/branches/2.3.x/shared/src/main/java/org/apache/myfaces/shared/application/FacesServletMappingUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/shared/src/main/java/org/apache/myfaces/shared/application/FacesServletMappingUtils.java?rev=1790059&r1=1790058&r2=1790059&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/shared/src/main/java/org/apache/myfaces/shared/application/FacesServletMappingUtils.java (original)
+++ myfaces/core/branches/2.3.x/shared/src/main/java/org/apache/myfaces/shared/application/FacesServletMappingUtils.java Tue Apr  4 01:02:38 2017
@@ -213,7 +213,7 @@ public class FacesServletMappingUtils
         }
     }
     
-    private static boolean isFacesServlet(FacesContext facesContext, String servletClassName)
+    public static boolean isFacesServlet(FacesContext facesContext, String servletClassName)
     {
         Class servletClass = org.apache.myfaces.shared.util.ClassUtils.simpleClassForName(
                 servletClassName);