1 files changed, 6 insertions, 1 deletions
diff --git a/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java b/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java
index b6774ae56a..ed611117d0 100644
--- a/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java
+++ b/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java
@@ -52,7 +52,12 @@ public class ThreadLocalInstances extends AbstractTestCase {
     private final FlagSeResource resource = new FlagSeResource() {
         @Override
         public DownloadStream getStream() {
-            reportCurrentStatus("resource handler");
+            ThreadLocalInstances.this.getContext().lock();
+            try {
+                reportCurrentStatus("resource handler");
+            } finally {
+                ThreadLocalInstances.this.getContext().unlock();
+            }
             return super.getStream();
         }
     };