summaryrefslogtreecommitdiffstats
path: root/server/src
diff options
context:
space:
mode:
authorHenri Sara <henri.sara@gmail.com>2017-09-28 16:38:20 +0300
committerTeemu Suo-Anttila <tsuoanttila@users.noreply.github.com>2017-09-28 16:38:20 +0300
commit5b69c166f29d228581f23d5e21ba41366336fc07 (patch)
treea0bcee1fe98a25cebf65a020b396769a8d937216 /server/src
parent198ec82c51cc3dc132676aeb74c7e44bef08adb6 (diff)
downloadvaadin-framework-8.2.0.alpha2.tar.gz
vaadin-framework-8.2.0.alpha2.zip
Revert "Store Vaadin session after each update" (#10112)8.2.0.alpha2
This reverts commit 48e202a80653c2c8a9e31db11814d23b87d6ec19. Also reverts the related release notes update.
Diffstat (limited to 'server/src')
-rw-r--r--server/src/main/java/com/vaadin/server/VaadinSession.java4
-rw-r--r--server/src/test/java/com/vaadin/ui/UITest.java17
2 files changed, 0 insertions, 21 deletions
diff --git a/server/src/main/java/com/vaadin/server/VaadinSession.java b/server/src/main/java/com/vaadin/server/VaadinSession.java
index d3da73d993..a49c286f4a 100644
--- a/server/src/main/java/com/vaadin/server/VaadinSession.java
+++ b/server/src/main/java/com/vaadin/server/VaadinSession.java
@@ -1035,10 +1035,6 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
+ ui.getUIId(),
e);
}
- // Store session after modifications have been done so that
- // Spring Session and possibly other implementations realize
- // that something has changed inside the session attribute
- service.storeSession(this, session);
}
}
} finally {
diff --git a/server/src/test/java/com/vaadin/ui/UITest.java b/server/src/test/java/com/vaadin/ui/UITest.java
index f2fcdcb055..8bc3c98470 100644
--- a/server/src/test/java/com/vaadin/ui/UITest.java
+++ b/server/src/test/java/com/vaadin/ui/UITest.java
@@ -8,9 +8,7 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpSession;
-import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
@@ -22,7 +20,6 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.server.VaadinServlet;
import com.vaadin.server.VaadinServletService;
import com.vaadin.server.VaadinSession;
-import com.vaadin.server.WrappedHttpSession;
import com.vaadin.server.communication.PushConnection;
import com.vaadin.shared.communication.PushMode;
import com.vaadin.util.CurrentInstanceTest;
@@ -178,21 +175,7 @@ public class UITest {
VaadinServletService service = new VaadinServletService(servlet,
deploymentConfiguration);
MockVaadinSession session = new MockVaadinSession(service);
- HttpSession mockHttpSession = EasyMock.createMock(HttpSession.class);
- WrappedHttpSession mockWrappedSession = new WrappedHttpSession(
- mockHttpSession) {
- @Override
- public Object getAttribute(String name) {
- String lockAttribute = service.getServiceName() + ".lock";
- if (lockAttribute.equals(name)) {
- return session.getLockInstance();
- } else {
- return super.getAttribute(name);
- }
- }
- };
session.lock();
- session.refreshTransients(mockWrappedSession, service);
ui.setSession(session);
ui.doInit(Mockito.mock(VaadinRequest.class), 1, "foo");
session.addUI(ui);