From ffc94a621d6fc02ffeb04cc7f537ba1416497e39 Mon Sep 17 00:00:00 2001
From: Bogdan Udrescu <bogdan@vaadin.com>
Date: Wed, 9 Jul 2014 18:40:26 +0300
Subject: [PATCH] Fix compile error caused by cherry-pick in commit 85c71bd

Change-Id: I9ca1597e7696c16462ecbb7a392292bf44fa8114
---
 .../vaadin/tests/server/CsrfTokenMissingTestServer.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/tests/src/com/vaadin/tests/server/CsrfTokenMissingTestServer.java b/server/tests/src/com/vaadin/tests/server/CsrfTokenMissingTestServer.java
index 30f1c85fef..2419bce588 100644
--- a/server/tests/src/com/vaadin/tests/server/CsrfTokenMissingTestServer.java
+++ b/server/tests/src/com/vaadin/tests/server/CsrfTokenMissingTestServer.java
@@ -28,6 +28,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.server.ServiceException;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinService;
 import com.vaadin.server.VaadinServlet;
 import com.vaadin.server.VaadinServletRequest;
@@ -37,6 +38,7 @@ import com.vaadin.server.communication.ServerRpcHandler.RpcRequest;
 import com.vaadin.shared.ApplicationConstants;
 import com.vaadin.tests.util.AlwaysLockedVaadinSession;
 import com.vaadin.tests.util.MockDeploymentConfiguration;
+import com.vaadin.util.CurrentInstance;
 
 /**
  * Test the actual csrf token validation by the server.
@@ -139,13 +141,16 @@ public class CsrfTokenMissingTestServer {
      * Create the requets.
      */
     private RpcRequest createRequest() {
+        CurrentInstance.set(VaadinRequest.class, vaadinRequest);
         try {
-            return new RpcRequest(getPayload(), vaadinRequest);
+            return new RpcRequest(getPayload());
         } catch (JSONException e) {
             LOGGER.log(Level.SEVERE, "", e);
 
             Assert.assertTrue(false);
             return null;
+        } finally {
+            CurrentInstance.set(VaadinRequest.class, null);
         }
     }
 
-- 
2.39.5