devinsy/kiss4web
devinsy/kiss4web
1
0
Fork 0
Code Issues 1 Pull requests Releases Activity

Indent.

Browse source
This commit is contained in:
Christian P. MOMON 2013-07-22 11:21:13 +02:00
parent 2c08119da5
commit 59e389c995
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/fr/devinsy/kiss4web/SimpleServletDispatcher.java
View file

@ -119,20 +119,31 @@ public class SimpleServletDispatcher extends HttpServlet
// String path = request.getRequestURI(); // String path = request.getRequestURI();
String path = request.getPathInfo(); String path = request.getPathInfo();
if ((!path.endsWith("/")) && (!path.endsWith(".xhtml")) && (!path.contains("-/"))) if (path == null)
{
response.setContentType("text/html");
PrintWriter out = response.getWriter();
out.println("<html><head></head><body>");
out.println("Unknow path.");
out.println("</body></html>");
out.close();
}
else if ((!path.endsWith("/")) && (!path.endsWith(".xhtml")) && (!path.contains("-/")))
{ {
// path = getServletContext().getRealPath("/") + // path = getServletContext().getRealPath("/") +
// request.getRequestURI(); // request.getRequestURI();
// First, search file in the WebContent root. // First, search file in the WebContent root.
path = getServletContext().getRealPath("/") + request.getPathInfo(); path = getServletContext().getRealPath("/") + request.getPathInfo();
logger.info("path1=" + path); logger.debug("path1=" + path);
if (!new File(path).exists()) if (!new File(path).exists())
{ {
// If file is not in WebContent root, search it in packaged // If file is not in WebContent root, search it in packaged
// classes. // classes.
path = getServletContext().getRealPath("/") + "WEB-INF/classes/" + this.webclassesRootPath.replaceAll("\\.", "/") + request.getPathInfo(); path = getServletContext().getRealPath("/") + "WEB-INF/classes/" + this.webclassesRootPath.replaceAll("\\.", "/") + request.getPathInfo();
} }
logger.info("path2=" + path); logger.debug("path2=" + path);
returnInlineFile(response, new File(path), getServletContext().getMimeType(path)); returnInlineFile(response, new File(path), getServletContext().getMimeType(path));
logger.info("File returned directly [" + path + "] with mimetype [" + getServletContext().getMimeType(path) + "]."); logger.info("File returned directly [" + path + "] with mimetype [" + getServletContext().getMimeType(path) + "].");