geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r148935 - /geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
Date Fri, 28 Jan 2005 22:16:46 GMT
Author: djencks
Date: Fri Jan 28 14:16:45 2005
New Revision: 148935

URL: http://svn.apache.org/viewcvs?view=rev&rev=148935
Log:
Fix GERONIMO-558.  Use the web app classloader's copy of Servlet to test inheritance
Modified:
   geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java

Modified: geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java?view=diff&rev=148935&p1=geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java&r1=148934&p2=geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java&r2=148935
==============================================================================
--- geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
(original)
+++ geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
Fri Jan 28 14:16:45 2005
@@ -708,7 +708,13 @@
             } catch (ClassNotFoundException e) {
                 throw new DeploymentException("Could not load servlet class " + servletClassName,
e);
             }
-            if (Servlet.class.isAssignableFrom(servletClass)) {
+            Class baseServletClass = null;
+            try {
+                baseServletClass = webClassLoader.loadClass(Servlet.class.getName());
+            } catch (ClassNotFoundException e) {
+                throw new DeploymentException("Could not load javax.servlet.Servlet in web
classloader", e);
+            }
+            if (baseServletClass.isAssignableFrom(servletClass)) {
             servletData = new GBeanData(servletObjectName, JettyServletHolder.GBEAN_INFO);
             servletData.setAttribute("servletClass", servletClassName);
             } else {

Mime
View raw message