Merge branch '1.4' into develop

greenlaw110 · greenlaw110 · commit 103661695198 · 2017-07-04T17:35:55.000+10:00
diff --git a/src/main/java/act/handler/UnknownHttpMethodProcessor.java b/src/main/java/act/handler/UnknownHttpMethodProcessor.java
@@ -37,7 +37,7 @@ public abstract class UnknownHttpMethodProcessor implements Serializable {
     private static class NotAllowed extends UnknownHttpMethodProcessor implements ExpressHandler {
         @Override
         public Result handle(H.Method method) {
-            return MethodNotAllowed.INSTANCE;
+            return MethodNotAllowed.get();
         }
 
         private Object readResolve() {
diff --git a/src/main/java/act/xio/undertow/UndertowRequest.java b/src/main/java/act/xio/undertow/UndertowRequest.java
@@ -27,6 +27,7 @@
 import io.undertow.server.handlers.Cookie;
 import io.undertow.util.HttpString;
 import org.osgl.http.H;
+import org.osgl.mvc.result.MethodNotAllowed;
 import org.osgl.util.E;
 import org.osgl.util.IO;
 
@@ -63,7 +64,11 @@ public String query() {
 
     @Override
     protected H.Method _method() {
-        return H.Method.valueOfIgnoreCase(hse.getRequestMethod().toString());
+        try {
+            return H.Method.valueOfIgnoreCase(hse.getRequestMethod().toString());
+        } catch (IllegalArgumentException e) {
+            throw MethodNotAllowed.get();
+        }
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public abstract class UnknownHttpMethodProcessor implements Serializable {`
`37`	`37`	`private static class NotAllowed extends UnknownHttpMethodProcessor implements ExpressHandler {`
`38`	`38`	`@Override`
`39`	`39`	`public Result handle(H.Method method) {`
`40`		`- return MethodNotAllowed.INSTANCE;`
	`40`	`+ return MethodNotAllowed.get();`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`private Object readResolve() {`