Merge branch '1.1.x'

Conflicts: spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java
2014-08-18 13:02:44 -07:00
parent 1fe1399959 eb721b1e9f
commit 83bd36d8e0
3 changed files with 73 additions and 2 deletions
--- 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) {