Prevent AlwaysLockedVaadinSession from being GCed during test

Change-Id: Id6e2e6c7e013e8c667f658d5877c5db7d072106b

diff --git a/server/tests/src/com/vaadin/tests/util/AlwaysLockedVaadinSession.java b/server/tests/src/com/vaadin/tests/util/AlwaysLockedVaadinSession.java
index 9b0b524b6a9b0fb52ebab84dd64b66195ea6c54c..89d3449b1239faaedc23a64ca5e8d549a1f64917 100644 (file)
--- a/server/tests/src/com/vaadin/tests/util/AlwaysLockedVaadinSession.java
+++ b/server/tests/src/com/vaadin/tests/util/AlwaysLockedVaadinSession.java
@@ -1,23 +1,13 @@
 package com.vaadin.tests.util;
 
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
+import com.vaadin.server.MockVaadinSession;
 import com.vaadin.server.VaadinService;
-import com.vaadin.server.VaadinSession;
-
-public class AlwaysLockedVaadinSession extends VaadinSession {
 
-    private ReentrantLock lock;
+public class AlwaysLockedVaadinSession extends MockVaadinSession {
 
     public AlwaysLockedVaadinSession(VaadinService service) {
         super(service);
-        lock = new ReentrantLock();
-        lock.lock();
+        lock();
     }
 
-    @Override
-    public Lock getLockInstance() {
-        return lock;
-    }
 }