Browse Source

Ensure VaadinSession.service is set up by storeInSession (#12204)

Change-Id: Ie707442f2625f3c9c07c75924c99299f07a4f3ec
tags/7.1.1
Leif Åstrand 11 years ago
parent
commit
94c0f86faf
1 changed files with 7 additions and 0 deletions
  1. 7
    0
      server/src/com/vaadin/server/VaadinSession.java

+ 7
- 0
server/src/com/vaadin/server/VaadinSession.java View File

@@ -426,6 +426,13 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
public void storeInSession(VaadinService service, WrappedSession session) {
assert hasLock(service, session);
session.setAttribute(getSessionAttributeName(service), this);

/*
* GAEVaadinServlet passes newly deserialized sessions here, which means
* that these transient fields need to be populated to avoid NPE from
* refreshLock().
*/
this.service = service;
this.session = session;
refreshLock();
}

Loading…
Cancel
Save