geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r1076488 - /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Date Thu, 03 Mar 2011 01:45:33 GMT
Author: xuhaihong
Date: Thu Mar  3 01:45:33 2011
New Revision: 1076488

URL: http://svn.apache.org/viewvc?rev=1076488&view=rev
Log:
Ignore web service configuration if it is a JSP in the web.xml

Modified:
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=1076488&r1=1076487&r2=1076488&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Thu Mar  3 01:45:33 2011
@@ -589,8 +589,11 @@ public class TomcatModuleBuilder extends
             }
 
             for (org.apache.openejb.jee.Servlet servlet : webApp.getServlet()) {
-                String servletName = servlet.getServletName();
                 String servletClassName = servlet.getServletClass();
+                if(servletClassName == null || servletClassName.length() == 0) {
+                    continue;
+                }
+                String servletName = servlet.getServletName();
                 Class<?> servletClass;
                 try {
                     servletClass = webBundle.loadClass(servletClassName);



Mime
View raw message