Merge pull request #1649 from jacobslei/master

fixed: handler 可能为非HandlerMethod 类型，出现类型转换异常
5 years ago · f5155e9d41
parent 67e54c4417 19708ebeb6
commit f5155e9d41
1 changed files with 65 additions and 63 deletions
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java
@ -34,10 +34,12 @@ public class WebExceptionResolver implements HandlerExceptionResolver {

 		// if json
 		boolean isJson = false;
-		HandlerMethod method = (HandlerMethod)handler;
-		ResponseBody responseBody = method.getMethodAnnotation(ResponseBody.class);
-		if (responseBody != null) {
-			isJson = true;
+		if (handler instanceof HandlerMethod) {
+			HandlerMethod method = (HandlerMethod)handler;
+			ResponseBody responseBody = method.getMethodAnnotation(ResponseBody.class);
+			if (responseBody != null) {
+				isJson = true;
+			}
 		}

 		// error result