ws-java
diff --git a/‎src/main/java/act/app/ActionContext.java‎
Lines changed: 0 additions & 5 deletions b/‎src/main/java/act/app/ActionContext.java‎
Lines changed: 0 additions & 5 deletions
diff --git a/‎src/main/java/act/util/ActErrorPageRender.java‎
Lines changed: 5 additions & 0 deletions b/‎src/main/java/act/util/ActErrorPageRender.java‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎src/main/resources/rythm/error/dev/e400.html‎
Lines changed: 0 additions & 1 deletion b/‎src/main/resources/rythm/error/dev/e400.html‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/main/resources/rythm/error/dev/e401.html‎
Lines changed: 0 additions & 1 deletion b/‎src/main/resources/rythm/error/dev/e401.html‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/main/resources/rythm/error/dev/e402.html‎
Lines changed: 0 additions & 1 deletion b/‎src/main/resources/rythm/error/dev/e402.html‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/main/resources/rythm/error/dev/e403.html‎
Lines changed: 0 additions & 1 deletion b/‎src/main/resources/rythm/error/dev/e403.html‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/main/resources/rythm/error/dev/e405.html‎
Lines changed: 0 additions & 1 deletion b/‎src/main/resources/rythm/error/dev/e405.html‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/main/resources/rythm/error/dev/e406.html‎
Lines changed: 0 additions & 2 deletions b/‎src/main/resources/rythm/error/dev/e406.html‎
Lines changed: 0 additions & 2 deletions
diff --git a/‎src/main/resources/rythm/error/dev/e409.html‎
Lines changed: 0 additions & 1 deletion b/‎src/main/resources/rythm/error/dev/e409.html‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/main/resources/rythm/error/dev/e500.html‎
Lines changed: 0 additions & 1 deletion b/‎src/main/resources/rythm/error/dev/e500.html‎
Lines changed: 0 additions & 1 deletion
@@ -145,11 +145,6 @@ public Map<String, Object> renderArgs() {
         return super.renderArgs();
     }
 
-    @Override
-    public ActionContext templatePath(String templatePath) {
-        return super.templatePath(templatePath);
-    }
-
     public RequestHandler handler() {
         return handler;
     }
 
@@ -103,6 +103,11 @@ private Template getTemplate(int statusCode, ActionContext context) {
             }
             context.templatePath(templatePath(statusCode, context));
             Template t = vm.load(context);
+            if (null == t && Act.isDev() && context.accept() == H.Format.HTML) {
+                // try default one
+                context.templatePath("/error/dev/errorPage.html");
+                t = vm.load(context);
+            }
             templateBag = $.var(t);
             templateCache.put(key, templateBag);
         }
Original file line number	Diff line number	Diff line change
`@@ -145,11 +145,6 @@ public Map<String, Object> renderArgs() {`
`145`	`145`	`return super.renderArgs();`
`146`	`146`	`}`
`147`	`147`
`148`		`- @Override`
`149`		`- public ActionContext templatePath(String templatePath) {`
`150`		`- return super.templatePath(templatePath);`
`151`		`- }`
`152`		`-`
`153`	`148`	`public RequestHandler handler() {`
`154`	`149`	`return handler;`
`155`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,11 @@ private Template getTemplate(int statusCode, ActionContext context) {`
`103`	`103`	`}`
`104`	`104`	`context.templatePath(templatePath(statusCode, context));`
`105`	`105`	`Template t = vm.load(context);`
	`106`	`+ if (null == t && Act.isDev() && context.accept() == H.Format.HTML) {`
	`107`	`+ // try default one`
	`108`	`+ context.templatePath("/error/dev/errorPage.html");`
	`109`	`+ t = vm.load(context);`
	`110`	`+ }`
`106`	`111`	`templateBag = $.var(t);`
`107`	`112`	`templateCache.put(key, templateBag);`
`108`	`113`	`}`