You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ru...@locus.apache.org on 2000/04/14 08:53:19 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/request SimpleMapper.java
rubys 00/04/13 23:53:19
Modified: src/share/org/apache/tomcat/core Tag: TOMCAT_31
Container.java
src/share/org/apache/tomcat/request Tag: TOMCAT_31
SimpleMapper.java
Log:
can't reliably override default servlet
Revision Changes Path
No revision
No revision
1.12.2.1 +1 -0 jakarta-tomcat/src/share/org/apache/tomcat/core/Container.java
Index: Container.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Container.java,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- Container.java 2000/02/17 21:19:01 1.12
+++ Container.java 2000/04/14 06:53:18 1.12.2.1
@@ -214,6 +214,7 @@
}
public ServletWrapper getHandler() {
+ if (handler == null) handler=context.getDefaultServlet();
return handler;
}
No revision
No revision
1.17.2.1 +0 -6 jakarta-tomcat/src/share/org/apache/tomcat/request/SimpleMapper.java
Index: SimpleMapper.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/request/SimpleMapper.java,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -r1.17 -r1.17.2.1
--- SimpleMapper.java 2000/04/05 23:29:58 1.17
+++ SimpleMapper.java 2000/04/14 06:53:18 1.17.2.1
@@ -190,10 +190,6 @@
// set default container, return
if (container == null) {
container=m.defaultContainer;
- if( m.defaultContainer.getHandler() == null ) {
- ServletWrapper sw=context.getDefaultServlet();
- m.defaultContainer.setHandler( sw );
- }
req.setWrapper( m.defaultContainer.getHandler() );
req.setServletPath( "" );
req.setPathInfo( path);
@@ -309,8 +305,6 @@
mtable.put( ctxP, m );
Container def=new Container();
def.setContext( ctx );
- ServletWrapper wrapper = ctx.getDefaultServlet();
- def.setHandler( wrapper );
m.defaultContainer=def;
}
if(debug>0) ctx.log( "Add mapping " + path + " " + ct + " " + m );