From 6e6bc25c44e3a020baa30dc37814f7357c4c3ed2 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 14 Aug 2014 20:00:33 -0700 Subject: [PATCH] Polish --- .../actuate/autoconfigure/MetricFilterAutoConfiguration.java | 2 +- .../security/AuthenticationManagerConfiguration.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfiguration.java index ec625073f0e..720a25e910e 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfiguration.java @@ -97,7 +97,7 @@ public class MetricFilterAutoConfiguration { try { httpStatus = HttpStatus.valueOf(status); } - catch (Exception e) { + catch (Exception ex) { // not convertible } if (bestMatchingPattern != null) { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java index 256b1d43e91..5436f511d37 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java @@ -127,6 +127,7 @@ public class AuthenticationManagerConfiguration extends GlobalAuthenticationConfigurerAdapter { private AuthenticationManagerBuilder defaultAuth; + private AuthenticationManager parent; public void configureParent(AuthenticationManagerBuilder auth) {