summaryrefslogtreecommitdiffstats
path: root/server/tests/src/com/vaadin
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-09-10 12:02:14 +0300
committerLeif Åstrand <leif@vaadin.com>2012-09-10 12:02:50 +0300
commitdef6b2fee7f8922e73858b15c956c11276adf176 (patch)
treebfb18caac9a421a67f37d9985120127d4c25d2a6 /server/tests/src/com/vaadin
parent88f77a4e7c1b6e0a92a58c9d9bd175120684ef2f (diff)
downloadvaadin-framework-def6b2fee7f8922e73858b15c956c11276adf176.tar.gz
vaadin-framework-def6b2fee7f8922e73858b15c956c11276adf176.zip
Revert "Verify that lock is held when accessing state (#9515)"
This reverts commit 998c9c97b4b7d9531028b442df4c38a33b60e5f0.
Diffstat (limited to 'server/tests/src/com/vaadin')
-rw-r--r--server/tests/src/com/vaadin/tests/data/converter/ConverterFactory.java2
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/abstractfield/AbstractFieldValueConversions.java1
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java5
3 files changed, 2 insertions, 6 deletions
diff --git a/server/tests/src/com/vaadin/tests/data/converter/ConverterFactory.java b/server/tests/src/com/vaadin/tests/data/converter/ConverterFactory.java
index bc5846acf0..b64514ea14 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/ConverterFactory.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/ConverterFactory.java
@@ -69,7 +69,6 @@ public class ConverterFactory extends TestCase {
final VaadinSession appWithCustomIntegerConverter = new VaadinSession();
appWithCustomIntegerConverter
.setConverterFactory(new ConverterFactory42());
- appWithCustomIntegerConverter.getLock().lock();
TextField tf = new TextField("", "123") {
@Override
@@ -98,7 +97,6 @@ public class ConverterFactory extends TestCase {
public void testApplicationConverterFactoryForDifferentThanCurrentApplication() {
final VaadinSession fieldAppWithCustomIntegerConverter = new VaadinSession();
- fieldAppWithCustomIntegerConverter.getLock().lock();
fieldAppWithCustomIntegerConverter
.setConverterFactory(new ConverterFactory42());
VaadinSession.setCurrent(new VaadinSession());
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbstractFieldValueConversions.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbstractFieldValueConversions.java
index 031e0c80bd..b48ad62bcc 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbstractFieldValueConversions.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbstractFieldValueConversions.java
@@ -187,7 +187,6 @@ public class AbstractFieldValueConversions extends TestCase {
public void testNumberDoubleConverterChange() {
final VaadinSession a = new VaadinSession();
- a.getLock().lock();
VaadinSession.setCurrent(a);
TextField tf = new TextField() {
@Override
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
index f259e156ff..c9f579a887 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
@@ -19,11 +19,10 @@ public class RemoveListenersOnDetach {
AbstractField field = new AbstractField() {
final private VaadinSession application = new VaadinSession() {
- {
- getLock().lock();
- }
+
};
private UI uI = new UI() {
+
@Override
protected void init(WrappedRequest request) {