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 2010/12/03 23:55:57 UTC

svn commit: r1042046 - /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java

Author: lu4242
Date: Fri Dec  3 22:55:56 2010
New Revision: 1042046

URL: http://svn.apache.org/viewvc?rev=1042046&view=rev
Log:
MYFACES-2994 faces-config.xml referenced in webAppConfig <absolute-ordering> could not be on the classpath

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java?rev=1042046&r1=1042045&r2=1042046&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java Fri Dec  3 22:55:56 2010
@@ -458,7 +458,13 @@ public class DefaultFacesConfigurationPr
                 {
                     //Add it to the sorted list
                     FacesConfigNameSlot nameSlot = (FacesConfigNameSlot) slot;
-                    getDispenser().feed(getFacesConfig(appConfigResources, nameSlot.getName()));
+                    // We need to check if the resource is on appConfigResources, otherwise we can
+                    // ignore it safely.
+                    FacesConfig targetFacesConfig = getFacesConfig(appConfigResources, nameSlot.getName());
+                    if (targetFacesConfig != null)
+                    {
+                        getDispenser().feed(targetFacesConfig);
+                    }
                 }
             }
         }