tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alex Chaffee <g...@edamame.stinky.com>
Subject Re: cvs commit: jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/session StandardSession.java
Date Thu, 22 Jun 2000 11:53:36 GMT
> Paul Lamb wrote:
> 
> > I'm feeling really lame right now, I just realized when I got your reply
> > that this was a catalina change and not a tomcat one. This makes much more
> > sense. This is a good thing.
> >
> > Now if I can just figure out which tomcat change from last night broke
> > contexts where the path=""...


On Thu, Jun 22, 2000 at 10:06:59AM -0700, Costin Manolache wrote:
> Probably mine - and I still have few more :-(
> 
> I'll make sure all tests are fine after I finish.  I think this one is result
> of DefaultServlet
>  rewrite.

Yup.  I've already fixed two problems in Context -- here's the diff --
should I check it in or just let you keep hacking?

The first fixes a nullpointer crash (the sw variable was null and we
tried to add it to a hashtable), the second fixes a compiler error,
since src/admin/WEB-INF/classes/ContextAdmin.java calls
getDefaultServlet.


Index: Context.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Context.java,v
retrieving revision 1.97
diff -u -r1.97 Context.java
--- Context.java	2000/06/22 00:15:00	1.97
+++ Context.java	2000/06/22 18:58:04
@@ -527,7 +527,7 @@
 	    // Workaround for frequent "bug" in web.xmls
 	    // Declare a default mapping
 	    log("Mapping with unregistered servlet " + servletName );
-	    addServlet( servletName, servletName );
+	    sw = addServlet( servletName, servletName );
 	}
 	if( "/".equals(path) )
 	    defaultServlet = sw;
@@ -714,8 +714,6 @@
 	if (firstLog == true) {
 	    csLog = Logger.getLogger("servlet_log");
 	    if( csLog!= null ) {
-		csLog.setCustomOutput("true");
-		csLog.setVerbosityLevel(Logger.INFORMATION);
 		firstLog = false;
 	    }
 	}

Index: admin/WEB-INF/classes/ContextAdmin.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/classes/ContextAdmin.java,v
retrieving revision 1.3
diff -u -r1.3 ContextAdmin.java
--- admin/WEB-INF/classes/ContextAdmin.java	2000/05/24 01:58:10	1.3
+++ admin/WEB-INF/classes/ContextAdmin.java	2000/06/22 18:59:22
@@ -83,9 +83,6 @@
 	    v.addElement("ATTRIBUTE: " + RequestUtil.URLDecode(context.getAttribute(key).toString()));
 	}
 
-	if (context.getDefaultServlet() != null)
-	    v.addElement("DEFAULT SERVLET NAME: " + context.getDefaultServlet().getServletName());
-
 	v.addElement("SERVER INFO: " + context.getEngineHeader());
 
 	String[] s = new String[v.size()];




Mime
View raw message