diff --git a/src/de/tudbut/tryumph/example/FileServer.java b/src/de/tudbut/tryumph/example/FileServer.java index 43efa85..d6172fa 100644 --- a/src/de/tudbut/tryumph/example/FileServer.java +++ b/src/de/tudbut/tryumph/example/FileServer.java @@ -64,22 +64,20 @@ public class FileServer implements IRequestCatcher, RequestHandler.Listener { return r; } - @GET - @Path("/style.css") - public void style(Request request, Callback res, Callback rej) { - res.call(new Response(request, request.context.file("style.css"), 200, "OK", "text/css")); - } - @GET @Path(".*/") public void onIndex(Request request, Callback res, Callback rej) { - res.call(new Response(request, fileContent(request, data.getString("dir") + request.path.replace("..", "") + "/index.html"), 200, "OK")); + res.call(new Response(request, fileContent(request, data.getString("dir") + request.realPath.replace("..", "") + "/index.html"), 200, "OK")); } @GET @Path("/.+") public void onFile(Request request, Callback res, Callback rej) { - res.call(new Response(request, fileContent(request, data.getString("dir") + request.path.replace("..", "")), 200, "OK")); + if(request.realPath.equals("/style.css")) { + res.call(new Response(request, request.context.file("style.css"), 200, "OK", "text/css")); + return; + } + res.call(new Response(request, fileContent(request, data.getString("dir") + request.realPath.replace("..", "")), 200, "OK")); } @Override