You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by cj...@apache.org on 2010/04/07 13:32:03 UTC

svn commit: r931505 - /myfaces/core/trunk/implee6/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java

Author: cjhoward
Date: Wed Apr  7 11:32:02 2010
New Revision: 931505

URL: http://svn.apache.org/viewvc?rev=931505&view=rev
Log:
MYFACES-2647 - isDelegatedFacesServlet does not consider null class names.

Modified:
    myfaces/core/trunk/implee6/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java

Modified: myfaces/core/trunk/implee6/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/implee6/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java?rev=931505&r1=931504&r2=931505&view=diff
==============================================================================
--- myfaces/core/trunk/implee6/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java (original)
+++ myfaces/core/trunk/implee6/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java Wed Apr  7 11:32:02 2010
@@ -152,6 +152,12 @@ public class MyFacesContainerInitializer
      */
     private boolean isDelegatedFacesServlet(String className)
     {
+        if (className == null) {
+            // The class name can be null if this is e.g., a JSP mapped to
+            // a servlet.
+
+            return false;
+        }
         try
         {
             Class<?> clazz = Class.forName(className);