[playframework#457] Fix servletWrapper notFound

bemace · Dec 21, 2010 · 6f0375a · 6f0375a
1 parent a92e1ab
commit 6f0375a
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/framework/src/play/server/ServletWrapper.java b/framework/src/play/server/ServletWrapper.java
@@ -458,6 +458,23 @@ public ServletInvocation(Request request, Response response, HttpServletRequest
             this.response = response;
         }
 
+        @Override
+        public boolean init() {
+            try {
+                return super.init();
+            } catch(NotFound e) {
+                serve404(httpServletRequest, httpServletResponse, e);
+                return false;
+            } catch(RenderStatic r) {
+                try {
+                    serveStatic(httpServletResponse, httpServletRequest, r);
+                } catch(IOException e) {
+                    throw new UnexpectedException(e);
+                }
+                return false;
+            }
+        }
+
         @Override
         public void run() {
             try {