From def6b2fee7f8922e73858b15c956c11276adf176 Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Mon, 10 Sep 2012 12:02:14 +0300 Subject: Revert "Verify that lock is held when accessing state (#9515)" This reverts commit 998c9c97b4b7d9531028b442df4c38a33b60e5f0. --- .../tests/src/com/vaadin/tests/data/converter/ConverterFactory.java | 2 -- .../component/abstractfield/AbstractFieldValueConversions.java | 1 - .../server/component/abstractfield/RemoveListenersOnDetach.java | 5 ++--- 3 files changed, 2 insertions(+), 6 deletions(-) (limited to 'server/tests/src/com/vaadin') 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) { -- cgit v1.2.3