Simplify if condition

ngocnhan-tran1996 · ngocnhan-tran1996 · commit a982fb5de04b · 2025-02-27T01:28:20.000+07:00
Signed-off-by: Tran Ngoc Nhan &lt;ngocnhan.tran1996@gmail.com&gt;
diff --git a/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java b/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -126,10 +126,7 @@ private boolean skipDispatch(HttpServletRequest request) {
 		if (isAsyncDispatch(request) && shouldNotFilterAsyncDispatch()) {
 			return true;
 		}
-		if (request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE) != null && shouldNotFilterErrorDispatch()) {
-			return true;
-		}
-		return false;
+		return request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE) != null && shouldNotFilterErrorDispatch();
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2022 the original author or authors.`
	`2`	`+ * Copyright 2002-2025 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -126,10 +126,7 @@ private boolean skipDispatch(HttpServletRequest request) {`
`126`	`126`	`if (isAsyncDispatch(request) && shouldNotFilterAsyncDispatch()) {`
`127`	`127`	`return true;`
`128`	`128`	`}`
`129`		`- if (request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE) != null && shouldNotFilterErrorDispatch()) {`
`130`		`- return true;`
`131`		`- }`
`132`		`- return false;`
	`129`	`+ return request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE) != null && shouldNotFilterErrorDispatch();`
`133`	`130`	`}`
`134`	`131`
`135`	`132`	`/**`