root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Remove a small race condition

This commit is contained in:
Dave Syer 2013-11-04 13:31:31 +00:00
parent 894940d7aa
commit c29d2b1be4
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/InMemoryMetricRepository.java
View File

@ -35,22 +35,23 @@ public class InMemoryMetricRepository implements MetricRepository {
@Override
public void increment(String metricName, int amount, Date timestamp) {
Measurement current = this.metrics.get(metricName);
if (current != null) {
Object lock = this.locks.putIfAbsent(metricName, new Object());
if (lock == null) {
lock = this.locks.get(metricName);
}
synchronized (lock) {
current = this.metrics.get(metricName);
Object lock = this.locks.putIfAbsent(metricName, new Object());
if (lock == null) {
lock = this.locks.get(metricName);
}
synchronized (lock) {
Measurement current = this.metrics.get(metricName);
if (current != null) {
Metric metric = current.getMetric();
this.metrics.replace(metricName, current, new Measurement(timestamp,
metric.increment(amount)));
return;
}
else {
this.metrics.putIfAbsent(metricName, new Measurement(timestamp,
new Metric(metricName, amount)));
}
}
this.metrics.putIfAbsent(metricName, new Measurement(timestamp, new Metric(
metricName, amount)));
}
@Override