geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r518802 - /geronimo/server/trunk/modules/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java
Date Thu, 15 Mar 2007 23:11:26 GMT
Author: djencks
Date: Thu Mar 15 16:11:25 2007
New Revision: 518802

URL: http://svn.apache.org/viewvc?view=rev&rev=518802
Log:
What a difference one character makes.  Less NPEs

Modified:
    geronimo/server/trunk/modules/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java

Modified: geronimo/server/trunk/modules/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java?view=diff&rev=518802&r1=518801&r2=518802
==============================================================================
--- geronimo/server/trunk/modules/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java
(original)
+++ geronimo/server/trunk/modules/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java
Thu Mar 15 16:11:25 2007
@@ -165,7 +165,7 @@
 
     private boolean hasFacesServlet(WebAppType webApp) {
         for (ServletType servlet : webApp.getServletArray()) {
-            if (servlet.isSetServletClass() & FACES_SERVLET_NAME.equals(servlet.getServletClass().getStringValue().trim()))
{
+            if (servlet.isSetServletClass() && FACES_SERVLET_NAME.equals(servlet.getServletClass().getStringValue().trim()))
{
                 return true;
             }
         }



Mime
View raw message