[#320] Error results should never throw exceptions!

playframework · Oct 21, 2010 · a87649b · a87649b
1 parent 32105a1
commit a87649b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/framework/src/play/mvc/results/Error.java b/framework/src/play/mvc/results/Error.java
@@ -3,6 +3,7 @@
 import java.util.Map;
 
 import play.Play;
+import play.exceptions.TemplateNotFoundException;
 import play.exceptions.UnexpectedException;
 import play.libs.MimeTypes;
 import play.mvc.Http;
@@ -31,10 +32,10 @@ public Error(int status, String reason) {
     public void apply(Request request, Response response) {
         response.status = status;
         String format = request.format;
-        if(request.isAjax() && "html".equals(format)) {
+        if (request.isAjax() && "html".equals(format)) {
             format = "txt";
         }
-        response.contentType = MimeTypes.getContentType("xx."+format);
+        response.contentType = MimeTypes.getContentType("xx." + format);
         Map<String, Object> binding = Scope.RenderArgs.current().data;
         binding.put("exception", this);
         binding.put("result", this);
@@ -43,7 +44,11 @@ public void apply(Request request, Response response) {
         binding.put("flash", Scope.Flash.current());
         binding.put("params", Scope.Params.current());
         binding.put("play", new Play());
-        String errorHtml = TemplateLoader.load("errors/" + this.status + "."+format).render(binding);
+        String errorHtml = getMessage();
+        try {
+            errorHtml = TemplateLoader.load("errors/" + this.status + "." + (format == null ? "html" : format)).render(binding);
+        } catch (Exception e) {
+        }
         try {
             response.out.write(errorHtml.getBytes("utf-8"));
         } catch (Exception e) {

diff --git a/framework/src/play/mvc/results/Forbidden.java b/framework/src/play/mvc/results/Forbidden.java
@@ -34,7 +34,11 @@ public void apply(Request request, Response response) {
         binding.put("flash", Scope.Flash.current());
         binding.put("params", Scope.Params.current());
         binding.put("play", new Play());
-        String errorHtml = TemplateLoader.load("errors/403."+format).render(binding);
+        String errorHtml = getMessage();
+        try {
+            errorHtml = TemplateLoader.load("errors/403."+(format == null ? "html" : format)).render(binding);
+        } catch(Exception e) {
+        }
         try {
             response.out.write(errorHtml.getBytes("utf-8"));
         } catch (Exception e) {

diff --git a/framework/src/play/mvc/results/NotFound.java b/framework/src/play/mvc/results/NotFound.java
@@ -3,6 +3,7 @@
 import java.util.Map;
 
 import play.Play;
+import play.exceptions.TemplateNotFoundException;
 import play.exceptions.UnexpectedException;
 import play.libs.MimeTypes;
 import play.mvc.Http;
@@ -45,7 +46,11 @@ public void apply(Request request, Response response) {
         binding.put("flash", Scope.Flash.current());
         binding.put("params", Scope.Params.current());
         binding.put("play", new Play());
-        String errorHtml = TemplateLoader.load("errors/404."+format).render(binding);
+        String errorHtml = "Not found";
+        try {
+            errorHtml = TemplateLoader.load("errors/404." + (format == null ? "html" : format)).render(binding);
+        } catch(Exception e) {
+        }
         try {
             response.out.write(errorHtml.getBytes("utf-8"));
         } catch (Exception e) {