fix actframework#286

greenlaw110 · greenlaw110 · commit a685f8a16d0f · 2017-07-11T08:20:05.000+10:00
diff --git a/src/main/java/act/app/ActionContext.java b/src/main/java/act/app/ActionContext.java
@@ -37,6 +37,7 @@
 import act.util.ActContext;
 import act.util.MissingAuthenticationHandler;
 import act.util.PropertySpec;
+import act.view.RenderAny;
 import org.osgl.$;
 import org.osgl.concurrent.ContextLocal;
 import org.osgl.http.H;
@@ -420,6 +421,9 @@ public ActionContext forceResponseStatus(H.Status status) {
     }
 
     public Result nullValueResult() {
+        if (hasRenderArgs()) {
+            return new RenderAny();
+        }
         if (null != forceResponseStatus) {
             return new Result(forceResponseStatus){};
         } else {
diff --git a/src/main/java/act/util/ActContext.java b/src/main/java/act/util/ActContext.java
@@ -325,6 +325,10 @@ public Map<String, Object> renderArgs() {
             return C.newMap(renderArgs);
         }
 
+        protected boolean hasRenderArgs() {
+            return !renderArgs.isEmpty();
+        }
+
         /**
          * Associate a user attribute to the context. Could be used by third party
          * libraries or user application
diff --git a/testapp/src/main/java/testapp/endpoint/OutputRequestParamsTestBed.java b/testapp/src/main/java/testapp/endpoint/OutputRequestParamsTestBed.java
@@ -6,8 +6,6 @@
 import act.util.OutputRequestParams;
 import org.osgl.mvc.annotation.GetAction;
 
-import static act.controller.Controller.Util.render;
-
 @UrlContext("/output-params")
 public class OutputRequestParamsTestBed {
 
@@ -16,13 +14,11 @@ public class OutputRequestParamsTestBed {
 
     @GetAction("specific")
     public void testOutputSpecificParam(@Output String param1, int param2, EventBus param3) {
-        throw render();
     }
 
     @GetAction("all")
     @OutputRequestParams
     public void testOutputAllParams(String param1, int param2, EventBus param3) {
-        throw render();
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@`
`6`	`6`	`import act.util.OutputRequestParams;`
`7`	`7`	`import org.osgl.mvc.annotation.GetAction;`
`8`	`8`
`9`		`-import static act.controller.Controller.Util.render;`
`10`		`-`
`11`	`9`	`@UrlContext("/output-params")`
`12`	`10`	`public class OutputRequestParamsTestBed {`
`13`	`11`
`@@ -16,13 +14,11 @@ public class OutputRequestParamsTestBed {`
`16`	`14`
`17`	`15`	`@GetAction("specific")`
`18`	`16`	`public void testOutputSpecificParam(@Output String param1, int param2, EventBus param3) {`
`19`		`- throw render();`
`20`	`17`	`}`
`21`	`18`
`22`	`19`	`@GetAction("all")`
`23`	`20`	`@OutputRequestParams`
`24`	`21`	`public void testOutputAllParams(String param1, int param2, EventBus param3) {`
`25`		`- throw render();`
`26`	`22`	`}`
`27`	`23`
`28`	`24`	`}`