Made looping over handlerExceptionResolvers more explicit.

16 years ago · ee0a294fe8
parent 61b76b2adc
commit ee0a294fe8
1 changed files with 5 additions and 2 deletions
--- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
+++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
@ -1055,8 +1055,11 @@ public class DispatcherServlet extends FrameworkServlet {

 		// Check registerer HandlerExceptionResolvers...
 		ModelAndView exMv = null;
-		for (Iterator<HandlerExceptionResolver> it = this.handlerExceptionResolvers.iterator(); exMv == null && it.hasNext();) {
-			exMv = it.next().resolveException(request, response, handler, ex);
+		for (HandlerExceptionResolver handlerExceptionResolver : this.handlerExceptionResolvers) {
+			exMv = handlerExceptionResolver.resolveException(request, response, handler, ex);
+			if (exMv != null) {
+				break;
+			}
 		}
 		if (exMv != null) {
 			if (exMv.isEmpty()) {