antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

Fixes in servlet registry methods

Browse source
This commit is contained in:
hns 2002-05-28 20:17:19 +00:00
parent c6d7496f4b
commit 5818dd8d52
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Acme/Serve/Serve.java
View file

@ -255,7 +255,7 @@ public class Serve implements ServletContext, Runnable
{ {
servlet.init( new ServeConfig( (ServletContext) this ) ); servlet.init( new ServeConfig( (ServletContext) this ) );
registry.put( urlPat, servlet ); registry.put( urlPat, servlet );
servlets.put( servlet.getClass().getName(), servlet ); servlets.put( urlPat, servlet );
} }
catch ( ServletException e ) catch ( ServletException e )
{ {
@ -266,12 +266,17 @@ public class Serve implements ServletContext, Runnable
public void removeServlet( String urlPat ) public void removeServlet( String urlPat )
{ {
registry.remove (urlPat); registry.remove (urlPat);
servlets.remove (urlPat);
} }
public void setDefaultServlet (Servlet servlet) { public void setDefaultServlet (Servlet servlet) {
defaultServlet = servlet; defaultServlet = servlet;
} }
public void removeDefaultServlet () {
defaultServlet = null;
}
/// Register a standard set of Servlets. These will return /// Register a standard set of Servlets. These will return
// files or directory listings, and run CGI programs, much like a // files or directory listings, and run CGI programs, much like a
// standard HTTP server. // standard HTTP server.
@ -665,10 +670,10 @@ class ServeConnection implements Runnable, HttpServletRequest, HttpServletRespon
servlet = serve.defaultServlet; servlet = serve.defaultServlet;
if ( servlet != null ) if ( servlet != null )
runServlet( (HttpServlet) servlet ); runServlet( (HttpServlet) servlet );
else if ( "/".equals( reqUriPath )) /* else if ( "/".equals( reqUriPath ))
sendRedirect (serve.props.getProperty ("rootapp", "base")); sendRedirect (serve.props.getProperty ("rootapp", "base"));
else if ( !reqUriPath.endsWith ("/")) else if ( !reqUriPath.endsWith ("/"))
sendRedirect (reqUriPath+"/"); sendRedirect (reqUriPath+"/"); */
else // Not found else // Not found
sendError (404, "Not Found", sendError (404, "Not Found",
"<p>If you are looking for a specific app, try <tt>/appname</tt>.</p>"+ "<p>If you are looking for a specific app, try <tt>/appname</tt>.</p>"+