fix issue: it respond back 404 when before handler return null with Result as return type

greenlaw110 · greenlaw110 · commit eeac63640026 · 2016-10-09T07:20:42.000+11:00
diff --git a/src/main/java/act/controller/meta/HandlerMethodMetaInfo.java b/src/main/java/act/controller/meta/HandlerMethodMetaInfo.java
@@ -158,6 +158,10 @@ public Type returnType() {
         return returnType.type();
     }
 
+    public ReturnTypeInfo returnTypeInfo() {
+        return returnType;
+    }
+
     public Type returnComponentType() {
         return returnType.componentType();
     }
diff --git a/src/main/java/act/handler/builtin/controller/impl/ReflectedHandlerInvoker.java b/src/main/java/act/handler/builtin/controller/impl/ReflectedHandlerInvoker.java
@@ -295,7 +295,11 @@ private Result invoke(M handlerMetaInfo, ActionContext context, Object controlle
                 throw (Exception) cause;
             }
         }
-        if (null == result && handler.hasReturn()) {
+        if (null == result && handler.hasReturn() && !handler.returnTypeInfo().isResult()) {
+            // ActFramework respond 404 Not Found when
+            // handler invoker return `null`
+            // and there are return type of the action method signature
+            // and the return type is **NOT** Result
             return NotFound.INSTANCE;
         }
         boolean hasTemplate = checkTemplate(context);
diff --git a/src/main/java/act/sys/meta/ReturnTypeInfo.java b/src/main/java/act/sys/meta/ReturnTypeInfo.java
@@ -1,6 +1,7 @@
 package act.sys.meta;
 
 import act.asm.Type;
+import act.util.AsmTypes;
 
 public class ReturnTypeInfo {
     private Type type;
@@ -31,6 +32,10 @@ public boolean hasReturn() {
         return type != Type.VOID_TYPE;
     }
 
+    public boolean isResult() {
+        return AsmTypes.RESULT_TYPE.equals(type);
+    }
+
     public static ReturnTypeInfo of(Type type) {
         return new ReturnTypeInfo(type);
     }

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,10 @@ public Type returnType() {`
`158`	`158`	`return returnType.type();`
`159`	`159`	`}`
`160`	`160`
	`161`	`+ public ReturnTypeInfo returnTypeInfo() {`
	`162`	`+ return returnType;`
	`163`	`+ }`
	`164`	`+`
`161`	`165`	`public Type returnComponentType() {`
`162`	`166`	`return returnType.componentType();`
`163`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,11 @@ private Result invoke(M handlerMetaInfo, ActionContext context, Object controlle`
`295`	`295`	`throw (Exception) cause;`
`296`	`296`	`}`
`297`	`297`	`}`
`298`		`- if (null == result && handler.hasReturn()) {`
	`298`	`+ if (null == result && handler.hasReturn() && !handler.returnTypeInfo().isResult()) {`
	`299`	`+ // ActFramework respond 404 Not Found when`
	`300`	+ // handler invoker return `null`
	`301`	`+ // and there are return type of the action method signature`
	`302`	`+ // and the return type is NOT Result`
`299`	`303`	`return NotFound.INSTANCE;`
`300`	`304`	`}`
`301`	`305`	`boolean hasTemplate = checkTemplate(context);`