Merge pull request #9497 from sun-jian:bugfix/dropwizard

snicoll · snicoll · commit 87b554d0620d · 2017-07-19T15:44:18.000+02:00
* pr/9497:
  Fix metric check in case of duplicate metric
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServices.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServices.java
@@ -148,7 +148,7 @@ private <T extends Metric> T register(String name, MetricRegistrar<T> registrar)
 		}
 		catch (IllegalArgumentException ex) {
 			Metric added = this.registry.getMetrics().get(name);
-			registrar.checkExisting(metric);
+			registrar.checkExisting(added);
 			return (T) added;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ private <T extends Metric> T register(String name, MetricRegistrar<T> registrar)`
`148`	`148`	`}`
`149`	`149`	`catch (IllegalArgumentException ex) {`
`150`	`150`	`Metric added = this.registry.getMetrics().get(name);`
`151`		`- registrar.checkExisting(metric);`
	`151`	`+ registrar.checkExisting(added);`
`152`	`152`	`return (T) added;`
`153`	`153`	`}`
`154`	`154`	`}`