From c503592c49818e32c208694f4f2299f530dfc5cf Mon Sep 17 00:00:00 2001 From: hns Date: Thu, 21 Mar 2002 15:49:02 +0000 Subject: [PATCH] Removed the need to register application servlets for the internal web server with both appname+"/" and appname+"/*", because Acme Serve now appends dual dummy slashes to the URI path if the servlet for a request isn't found. --- src/Acme/Serve/Serve.java | 3 +++ src/helma/main/ApplicationManager.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Acme/Serve/Serve.java b/src/Acme/Serve/Serve.java index c72ccbc3..a7c8390b 100644 --- a/src/Acme/Serve/Serve.java +++ b/src/Acme/Serve/Serve.java @@ -658,6 +658,9 @@ class ServeConnection implements Runnable, HttpServletRequest, HttpServletRespon if (reqQuery != null) reqQuery = decode (reqQuery); Servlet servlet = (Servlet) serve.registry.get( reqUriPath ); + // maybe the application name without slash? try with slash appended + if (servlet == null) + servlet = (Servlet) serve.registry.get (reqUriPath+"//"); if (servlet == null) servlet = serve.defaultServlet; if ( servlet != null ) diff --git a/src/helma/main/ApplicationManager.java b/src/helma/main/ApplicationManager.java index ac4ede4f..04e99107 100644 --- a/src/helma/main/ApplicationManager.java +++ b/src/helma/main/ApplicationManager.java @@ -94,7 +94,7 @@ public class ApplicationManager { if (server.websrv == null) { Naming.unbind ("//:"+port+"/"+appName); } else { - server.websrv.removeServlet ("/"+appName+"/"); + // server.websrv.removeServlet ("/"+appName+"/"); server.websrv.removeServlet ("/"+appName+"/*"); } app.stop (); @@ -116,7 +116,7 @@ public class ApplicationManager { if ("base".equalsIgnoreCase (appName)) server.websrv.setDefaultServlet (servlet); else { - server.websrv.addServlet ("/"+appName+"/", servlet); + // server.websrv.addServlet ("/"+appName+"/", servlet); server.websrv.addServlet ("/"+appName+"/*", servlet); } }