Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-01 09:42:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

Browse Source 
Closes gh-13145
This commit is contained in:
Josh Cummings 2023-05-08 14:19:15 -06:00
commit cdcc2d31d1
No known key found for this signature in database
GPG Key ID: A306A51F43B8E5A5
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
web/src/main/java/org/springframework/security/web/server/ObservationWebFilterChainDecorator.java
View File

@ -21,6 +21,8 @@ import java.util.List;
import java.util.ListIterator; import java.util.ListIterator;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import io.micrometer.common.KeyValue; import io.micrometer.common.KeyValue;
import io.micrometer.common.KeyValues; import io.micrometer.common.KeyValues;
@ -382,6 +384,8 @@ public final class ObservationWebFilterChainDecorator implements WebFilterChainP
private static final ObservationReference NOOP = new ObservationReference(Observation.NOOP); private static final ObservationReference NOOP = new ObservationReference(Observation.NOOP);
private final Lock lock = new ReentrantLock();
private final AtomicInteger state = new AtomicInteger(0); private final AtomicInteger state = new AtomicInteger(0);
private final Observation observation; private final Observation observation;
@ -391,20 +395,38 @@ public final class ObservationWebFilterChainDecorator implements WebFilterChainP
} }
private void start() { private void start() {
if (this.state.compareAndSet(0, 1)) { try {
this.observation.start(); this.lock.lock();
if (this.state.compareAndSet(0, 1)) {
this.observation.start();
}
}
finally {
this.lock.unlock();
} }
} }
private void error(Throwable ex) { private void error(Throwable ex) {
if (this.state.get() == 1) { try {
this.observation.error(ex); this.lock.lock();
if (this.state.get() == 1) {
this.observation.error(ex);
}
}
finally {
this.lock.unlock();
} }
} }
private void stop() { private void stop() {
if (this.state.compareAndSet(1, 2)) { try {
this.observation.stop(); this.lock.lock();
if (this.state.compareAndSet(1, 2)) {
this.observation.stop();
}
}
finally {
this.lock.unlock();
} }
} }