diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/src/com/vaadin/server/VaadinService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/server/src/com/vaadin/server/VaadinService.java b/server/src/com/vaadin/server/VaadinService.java index 083bd4bedf..af0c280c19 100644 --- a/server/src/com/vaadin/server/VaadinService.java +++ b/server/src/com/vaadin/server/VaadinService.java @@ -1553,7 +1553,8 @@ public abstract class VaadinService implements Serializable { */ public static void verifyNoOtherSessionLocked(VaadinSession session) { VaadinSession otherSession = VaadinSession.getCurrent(); - if (otherSession != null && otherSession != session) { + if (otherSession != null && otherSession != session + && otherSession.hasLock()) { throw new IllegalStateException( "Can't access session while another session is locked by the same thread. This restriction is intended to help avoid deadlocks."); } |