Skip to content

Commit 1b6fc69

Browse files
authored
fix: use access and not lock (#14827)
Use access so that we do not deadlock. Fixes vaadin/multiplatform-runtime#101
1 parent 0f9e7b7 commit 1b6fc69

2 files changed

Lines changed: 9 additions & 5 deletions

File tree

‎flow-server/src/main/java/com/vaadin/flow/server/VaadinSession.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,15 +210,12 @@ public void valueUnbound(HttpSessionBindingEvent event) {
210210
// the latter case the session field should be set to {@code null}
211211
// immediately to avoid using HTTP session object which is invalid (all
212212
// methods throw exceptions).
213-
lock();
214-
try {
213+
access(() -> {
215214
if (getAttribute(CLOSE_SESSION_EXPLICITLY) == null) {
216215
session = null;
217216
}
218217
setAttribute(CLOSE_SESSION_EXPLICITLY, null);
219-
} finally {
220-
unlock();
221-
}
218+
});
222219
}
223220

224221
/**

‎flow-server/src/test/java/com/vaadin/flow/server/VaadinSessionTest.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import java.util.Map;
2828
import java.util.Optional;
2929
import java.util.Set;
30+
import java.util.concurrent.Future;
3031
import java.util.concurrent.TimeUnit;
3132
import java.util.concurrent.atomic.AtomicBoolean;
3233
import java.util.concurrent.locks.Lock;
@@ -412,6 +413,12 @@ protected Lock getSessionLock(WrappedSession wrappedSession) {
412413
return lock;
413414
}
414415

416+
@Override
417+
public Future<Void> accessSession(VaadinSession session,
418+
Command command) {
419+
command.execute();
420+
return Mockito.mock(Future.class);
421+
}
415422
};
416423

417424
VaadinSession vaadinSession = new VaadinSession(mockService) {

0 commit comments

Comments
 (0)