[Httpunit-commit] CVS: httpunit/src/com/meterware/servletunit ServletRunner.java,1.15,1.16 WebApplication.java,1.8,1.9

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/src/com/meterware/servletunit
In directory usw-pr-cvs1:/tmp/cvs-serv8706/src/com/meterware/servletunit

Modified Files:
	ServletRunner.java WebApplication.java 
Log Message:
Some cleanup and refactoring

Index: ServletRunner.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/servletunit/ServletRunner.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ServletRunner.java	20 May 2002 16:00:44 -0000	1.15
+++ ServletRunner.java	21 May 2002 20:43:31 -0000	1.16
@@ -129,11 +129,6 @@
 //-------------------------------------------- package methods ---------------------------------------------------------
 
 
-    Servlet getServlet( URL url ) throws ServletException {
-        return _application.getServlet( url );
-    }
-
-
     ServletUnitContext getContext() {
         return _context;
     }

Index: WebApplication.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/servletunit/WebApplication.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- WebApplication.java	16 May 2002 19:04:13 -0000	1.8
+++ WebApplication.java	21 May 2002 20:43:31 -0000	1.9
@@ -529,7 +529,10 @@
 
             if (_urlTree.containsKey( "/" )) return (ServletConfiguration) _urlTree.get( "/" );
 
-            String className = url.substring( 1 );
+            final String prefix = "/servlet/";
+            if (!url.startsWith( prefix )) return null;
+
+            String className = url.substring( prefix.length() );
             try {
                 Class.forName( className );
                 return new ServletConfiguration( className );