Add some getCurrent() methods (#9505)

This change also clears the current instances in the beginning of each
request in case something has accidentally been left uncleared in a
previous request on the same thread.

1 files changed, 3 insertions, 6 deletions

diff --git a/uitest/src/com/vaadin/tests/resources/NonExistingFileResource.java b/uitest/src/com/vaadin/tests/resources/NonExistingFileResource.java
index c102291b50..f55c1f1f1d 100644
--- a/uitest/src/com/vaadin/tests/resources/NonExistingFileResource.java
+++ b/uitest/src/com/vaadin/tests/resources/NonExistingFileResource.java
@@ -3,11 +3,10 @@ package com.vaadin.tests.resources;
 import java.io.File;
 
 import com.vaadin.server.FileResource;
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinService;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.util.CurrentInstance;
 
 public class NonExistingFileResource extends TestBase {
 
@@ -26,10 +25,8 @@ public class NonExistingFileResource extends TestBase {
 
             @Override
             public void buttonClick(ClickEvent event) {
-                FileResource res = new FileResource(new File(CurrentInstance
-                        .get(WrappedRequest.class).getVaadinService()
-                        .getBaseDirectory()
-                        + "/" + filename));
+                FileResource res = new FileResource(new File(VaadinService
+                        .getCurrent().getBaseDirectory() + "/" + filename));
                 getMainWindow().open(res);
 
             }