Merge branch '2.2.x'

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilter.java

@@ -128,7 +128,8 @@ public class WebMvcMetricsFilter extends OncePerRequestFilter {
 				Builder builder = this.autoTimer.builder(this.metricName);
 				timerSample.stop(getTimer(builder, handler, request, response, exception));
 			}
-		} else {
+		}
+		else {
 			for (Timed annotation : annotations) {
 				Builder builder = Timer.builder(annotation, this.metricName);
 				timerSample.stop(getTimer(builder, handler, request, response, exception));