Merge branch '1.1.x'

237defaf · Phillip Webb · 53637eaa · 41c15f20 · 237defaf
Commit 237defaf authored Dec 01, 2014 by Phillip Webb
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

CodahaleMetricWriter.java ...ork/boot/actuate/metrics/writer/CodahaleMetricWriter.java +3 -2

No files found.
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/CodahaleMetricWriter.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/CodahaleMetricWriter.java
@@ -103,8 +103,9 @@ public class CodahaleMetricWriter implements MetricWriter {
 	private Object getGuageLock(String name) {
 		Object lock = this.gaugeLocks.get(name);
 		if (lock == null) {
-			this.gaugeLocks.putIfAbsent(name, new Object());
+			Object newLock = new Object();
-			lock = this.gaugeLocks.get(name);
+			lock = this.gaugeLocks.putIfAbsent(name, newLock);
+			lock = (lock == null ? newLock : lock);
 		}
 		return lock;
 	}