You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@hyperreal.org on 1999/11/06 01:19:55 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core Container.java Context.java InvokerServlet.java
costin 99/11/05 16:19:55
Modified: . build.xml
src/share/org/apache/tomcat/core Container.java Context.java
InvokerServlet.java
Log:
Lookup cleanup.
Revision Changes Path
1.11 +1 -0 jakarta-tomcat/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 1999/10/20 22:07:49 1.10
+++ build.xml 1999/11/06 00:19:44 1.11
@@ -87,6 +87,7 @@
<mkdir dir="${tomcat.home}/webpages" />
<copydir src="src/share/javax" dest="${tomcat.home}/src/javax"/>
+ <copyfile src="../jakarta-tools/ant.jar" dest="${tomcat.home}/lib/ant.jar"/>
<copyfile src="../jakarta-tools/projectx-tr2.jar" dest="${tomcat.home}/lib/xml.jar"/>
<copydir src="src/shell" dest="${tomcat.home}" />
1.5 +4 -4 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Container.java 1999/11/06 00:07:32 1.4
+++ Container.java 1999/11/06 00:19:49 1.5
@@ -332,11 +332,11 @@
return lookupResult;
}
- ServletWrapper lookupServlet(String servletName) {
+ ServletWrapper getServletByName(String servletName) {
return (ServletWrapper)servlets.get(servletName);
}
- LookupResult lookupServletAndLoadByName(String servletName) {
+ ServletWrapper getServletAndLoadByName(String servletName) {
// XXX
// make sure that we aren't tramping over ourselves!
ServletWrapper wrapper = new ServletWrapper(this);
@@ -345,9 +345,9 @@
servlets.put(servletName, wrapper);
- return new LookupResult(wrapper, null, "");
+ return wrapper;
}
-
+
ServletWrapper loadServlet(String servletClassName) {
// XXX
// check for duplicates!
1.10 +1 -1 jakarta-tomcat/src/share/org/apache/tomcat/core/Context.java
Index: Context.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Context.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Context.java 1999/11/06 00:07:32 1.9
+++ Context.java 1999/11/06 00:19:50 1.10
@@ -954,7 +954,7 @@
while (e.hasMoreElements()) {
String servletName = (String)e.nextElement();
- ServletsWrapper result = container.getServletByName(servletName);
+ ServletWrapper result = container.getServletByName(servletName);
if(result==null)
System.out.println("Warning: we try to load an undefined servlet " + servletName);
1.3 +8 -10 jakarta-tomcat/src/share/org/apache/tomcat/core/InvokerServlet.java
Index: InvokerServlet.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/InvokerServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InvokerServlet.java 1999/10/16 01:32:03 1.2
+++ InvokerServlet.java 1999/11/06 00:19:52 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/InvokerServlet.java,v 1.2 1999/10/16 01:32:03 duncan Exp $
- * $Revision: 1.2 $
- * $Date: 1999/10/16 01:32:03 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/InvokerServlet.java,v 1.3 1999/11/06 00:19:52 costin Exp $
+ * $Revision: 1.3 $
+ * $Date: 1999/11/06 00:19:52 $
*
* ====================================================================
*
@@ -181,17 +181,15 @@
// try the easy one -- lookup by name
- //ServletWrapper wrapper = container.getServlet(servletName);
+ ServletWrapper wrapper = container.getServletByName(servletName);
- LookupResult result = container.lookupServletByName(servletName);
-
- if (result == null) {
+ if (wrapper == null) {
// try the more forceful approach
- result = container.lookupServletAndLoadByName(servletName);
+ wrapper = container.getServletAndLoadByName(servletName);
}
- if (result == null) {
+ if (wrapper == null) {
// we are out of luck
doError(response);
@@ -238,7 +236,7 @@
}
}
- result.getWrapper().handleRequest(requestfacade, responsefacade);
+ wrapper.handleRequest(requestfacade, responsefacade);
if (inInclude) {
if (savedServletPath != null) {