You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2015/10/27 14:28:52 UTC

svn commit: r1710809 - /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java

Author: tandraschko
Date: Tue Oct 27 13:28:52 2015
New Revision: 1710809

URL: http://svn.apache.org/viewvc?rev=1710809&view=rev
Log:
MYFACES-4017 custom expression factory not correctly loaded

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java?rev=1710809&r1=1710808&r2=1710809&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java Tue Oct 27 13:28:52 2015
@@ -473,7 +473,13 @@ public abstract class AbstractFacesIniti
     {
         try
         {
-            Class<?> expressionFactoryClass = Class.forName(expressionFactoryClassName);
+            ClassLoader cl = ClassUtils.getContextClassLoader();
+            if (cl == null)
+            {
+                cl = AbstractFacesInitializer.class.getClassLoader();
+            }
+
+            Class<?> expressionFactoryClass = cl.loadClass(expressionFactoryClassName);
             return (ExpressionFactory) expressionFactoryClass.newInstance();
         }
         catch (Exception ex)