use RequestContextHolder.resetRequestAttributes() to clear request th…

…readlocal variables
mfatihercik · Jan 3, 2015 · 80a1333 · 80a1333
1 parent bbf8a36
commit 80a1333
Show file tree

Hide file tree

Showing 28 changed files with 32 additions and 32 deletions.
diff --git a/grails-plugin-codecs/src/test/groovy/org/grails/web/codecs/URLCodecTests.groovy b/grails-plugin-codecs/src/test/groovy/org/grails/web/codecs/URLCodecTests.groovy
@@ -17,7 +17,7 @@ class URLCodecTests extends GroovyTestCase {
     }
 
     protected void tearDown() {
-        RequestContextHolder.setRequestAttributes(null)
+        RequestContextHolder.resetRequestAttributes()
     }
 
     void testEncode() {

diff --git a/.../groovy/grails/compiler/web/ControllerActionTransformerClosureActionOverridingSpec.groovy b/.../groovy/grails/compiler/web/ControllerActionTransformerClosureActionOverridingSpec.groovy
@@ -61,6 +61,6 @@ class ControllerActionTransformerClosureActionOverridingSpec extends Specificati
     }
 
     def cleanupSpec() {
-        RequestContextHolder.setRequestAttributes(null)
+        RequestContextHolder.resetRequestAttributes()
     }
 }
diff --git a/...est/groovy/org/codehaus/groovy/grails/compiler/web/ControllerActionTransformerSpec.groovy b/...est/groovy/org/codehaus/groovy/grails/compiler/web/ControllerActionTransformerSpec.groovy
@@ -191,7 +191,7 @@ class ControllerActionTransformerSpec extends Specification {
 */
 
     def cleanup() {
-        RequestContextHolder.setRequestAttributes(null)
+        RequestContextHolder.resetRequestAttributes()
         System.properties[BuildSettings.CONVERT_CLOSURES_KEY] = 'false'
     }
 }
diff --git a/grails-plugin-testing/src/main/groovy/grails/test/runtime/ControllerTestPlugin.groovy b/grails-plugin-testing/src/main/groovy/grails/test/runtime/ControllerTestPlugin.groovy
@@ -152,7 +152,7 @@ class ControllerTestPlugin implements TestPlugin {
 
     @CompileStatic(TypeCheckingMode.SKIP)
     protected void clearGrailsWebRequest(TestRuntime runtime) {
-        RequestContextHolder.setRequestAttributes(null)
+        RequestContextHolder.resetRequestAttributes()
         runtime.getValue("groovyPages")?.clear()
         GrailsWebRequest webRequest = runtime.getValueIfExists("webRequest")
         def ctx = webRequest?.applicationContext

diff --git a/...uite-base/src/main/groovy/org/grails/web/servlet/mvc/AbstractGrailsControllerTests.groovy b/...uite-base/src/main/groovy/org/grails/web/servlet/mvc/AbstractGrailsControllerTests.groovy
@@ -148,7 +148,7 @@ abstract class AbstractGrailsControllerTests extends GroovyTestCase {
 
     protected void tearDown() {
         ga.mainContext.close()
-        RequestContextHolder.setRequestAttributes(null)
+        RequestContextHolder.resetRequestAttributes()
         ExpandoMetaClass.disableGlobally()
 
         Holders.config = null
@@ -167,7 +167,7 @@ abstract class AbstractGrailsControllerTests extends GroovyTestCase {
             callable()
         }
         finally {
-            RequestContextHolder.setRequestAttributes(null)
+            RequestContextHolder.resetRequestAttributes()
 
         }
     }

diff --git a/grails-test-suite-base/src/main/groovy/org/grails/web/taglib/AbstractGrailsTagTests.groovy b/grails-test-suite-base/src/main/groovy/org/grails/web/taglib/AbstractGrailsTagTests.groovy
@@ -92,7 +92,7 @@ abstract class AbstractGrailsTagTests extends GroovyTestCase {
             callable()
         }
         finally {
-            RequestContextHolder.setRequestAttributes(null)
+            RequestContextHolder.resetRequestAttributes()
             Holders.config = null
         }
     }
@@ -316,7 +316,7 @@ abstract class AbstractGrailsTagTests extends GroovyTestCase {
         // static and likely to cause tests to interfere with each other.
         appCtx.groovyPagesTemplateEngine.clearPageCache()
 
-        RequestContextHolder.setRequestAttributes(null)
+        RequestContextHolder.resetRequestAttributes()
         GroovySystem.metaClassRegistry.setMetaClassCreationHandle(originalHandler)
 
         onDestroy()

diff --git a/...test-suite-uber/src/test/groovy/org/grails/web/errors/GrailsExceptionResolverTests.groovy b/...test-suite-uber/src/test/groovy/org/grails/web/errors/GrailsExceptionResolverTests.groovy
@@ -35,7 +35,7 @@ class GrailsExceptionResolverTests extends GroovyTestCase {
 
     @Override
     protected void tearDown() {
-        RequestContextHolder.setRequestAttributes null
+        RequestContextHolder.resetRequestAttributes()
     }
 
     @Override

diff --git a/...e-uber/src/test/groovy/org/grails/web/i18n/ParamsAwareLocaleChangeInterceptorTests.groovy b/...e-uber/src/test/groovy/org/grails/web/i18n/ParamsAwareLocaleChangeInterceptorTests.groovy
@@ -14,7 +14,7 @@ import org.springframework.web.servlet.i18n.SessionLocaleResolver
 class ParamsAwareLocaleChangeInterceptorTests extends GroovyTestCase {
 
     protected void tearDown() {
-        RequestContextHolder.setRequestAttributes null
+        RequestContextHolder.resetRequestAttributes()
     }
 
     void testSwitchLocaleWithStringArrayParamsObject() {

diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/metaclass/WithFormMethodTests.groovy b/grails-test-suite-uber/src/test/groovy/org/grails/web/metaclass/WithFormMethodTests.groovy
@@ -39,7 +39,7 @@ class WithFormMethodTests extends GroovyTestCase {
 
     @Override
     protected void tearDown() {
-        RequestContextHolder.setRequestAttributes(null)
+        RequestContextHolder.resetRequestAttributes()
     }
 
     void testMissingToken() {

diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/sitemesh/GSPSitemeshPageTests.groovy b/grails-test-suite-uber/src/test/groovy/org/grails/web/sitemesh/GSPSitemeshPageTests.groovy
@@ -124,6 +124,6 @@ class GSPSitemeshPageTests extends AbstractGrailsTagTests {
     }
 
     void tearDown() {
-         RequestContextHolder.setRequestAttributes(null)
+         RequestContextHolder.resetRequestAttributes()
     }
 }
diff --git a/...-suite-uber/src/test/groovy/org/grails/web/sitemesh/GrailsLayoutDecoratorMapperTests.java b/...-suite-uber/src/test/groovy/org/grails/web/sitemesh/GrailsLayoutDecoratorMapperTests.java
@@ -302,6 +302,6 @@ public void testDecoratedByLayoutPropertyInController() throws Exception {
 
     @Override
     protected void tearDown() {
-        RequestContextHolder.setRequestAttributes(null);
+        RequestContextHolder.resetRequestAttributes();
     }
 }
diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/util/CodecPrintWriterTest.java b/grails-test-suite-uber/src/test/groovy/org/grails/web/util/CodecPrintWriterTest.java
@@ -128,7 +128,7 @@ public void testCodecAndNoCodecGRAILS8405() throws IOException {
         codecOut.flush();
 
         // clear thread local
-        RequestContextHolder.setRequestAttributes(null);
+        RequestContextHolder.resetRequestAttributes();
 
         assertEquals("-> hola <-123added-> too <-4-> A <--> B <-5-> C <-", target.getValue());
 

diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/util/WebUtilsTests.groovy b/grails-test-suite-uber/src/test/groovy/org/grails/web/util/WebUtilsTests.groovy
@@ -20,7 +20,7 @@ class WebUtilsTests extends GroovyTestCase {
 
     def config
     protected void setUp() {
-        RequestContextHolder.setRequestAttributes null
+        RequestContextHolder.resetRequestAttributes()
         config = new ConfigSlurper().parse("""
 grails.mime.file.extensions=false
 grails.mime.types = [ html: ['text/html','application/xhtml+xml'],
@@ -39,7 +39,7 @@ grails.mime.types = [ html: ['text/html','application/xhtml+xml'],
     }
 
     protected void tearDown() {
-        RequestContextHolder.setRequestAttributes null
+        RequestContextHolder.resetRequestAttributes()
     }
 
     void testAreFileExtensionsEnabled() {

diff --git a/grails-test-suite-web/src/test/groovy/org/grails/gsp/jsp/GroovyPagesPageContextTests.groovy b/grails-test-suite-web/src/test/groovy/org/grails/gsp/jsp/GroovyPagesPageContextTests.groovy
@@ -17,7 +17,7 @@ class GroovyPagesPageContextTests extends GroovyTestCase {
     }
 
     protected void tearDown() {
-        RequestContextHolder.setRequestAttributes null
+        RequestContextHolder.resetRequestAttributes()
     }
 
     void testPageContextState() {

diff --git a/grails-test-suite-web/src/test/groovy/org/grails/gsp/jsp/IterativeJspTagTests.groovy b/grails-test-suite-web/src/test/groovy/org/grails/gsp/jsp/IterativeJspTagTests.groovy
@@ -24,7 +24,7 @@ class IterativeJspTagTests extends GroovyTestCase {
     }
 
     protected void tearDown() {
-        RequestContextHolder.setRequestAttributes null
+        RequestContextHolder.resetRequestAttributes()
         GroovySystem.metaClassRegistry.removeMetaClass TagLibraryResolverImpl
     }
 

diff --git a/grails-test-suite-web/src/test/groovy/org/grails/gsp/jsp/SimpleJspTagTests.groovy b/grails-test-suite-web/src/test/groovy/org/grails/gsp/jsp/SimpleJspTagTests.groovy
@@ -24,7 +24,7 @@ class SimpleJspTagTests extends GroovyTestCase {
     }
 
     protected void tearDown() {
-        RequestContextHolder.setRequestAttributes null
+        RequestContextHolder.resetRequestAttributes()
     }
 
     void testSimpleTagUsage() {

diff --git a/grails-test-suite-web/src/test/groovy/org/grails/gsp/jsp/SimpleTagTests.groovy b/grails-test-suite-web/src/test/groovy/org/grails/gsp/jsp/SimpleTagTests.groovy
@@ -26,7 +26,7 @@ class SimpleTagTests extends GroovyTestCase {
     }
 
     protected void tearDown() {
-        RequestContextHolder.setRequestAttributes null
+        RequestContextHolder.resetRequestAttributes()
     }
 
     void testSimpleTagWithBodyUsage() {

diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/pages/GroovyPageServletSpec.groovy b/grails-test-suite-web/src/test/groovy/org/grails/web/pages/GroovyPageServletSpec.groovy
@@ -29,10 +29,10 @@ class GroovyPageServletSpec extends Specification{
     private SimpleMapResourceLoader resourceLoader
 
     void setup() {
-        RequestContextHolder.setRequestAttributes(null)
+        RequestContextHolder.resetRequestAttributes()
     }
     void cleanup() {
-        RequestContextHolder.setRequestAttributes(null)
+        RequestContextHolder.resetRequestAttributes()
     }
 
     void "Test create response writer method"() {

diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/pages/ParseTests.java b/grails-test-suite-web/src/test/groovy/org/grails/web/pages/ParseTests.java
@@ -126,7 +126,7 @@ public void testParseWithUTF8() throws Exception {
             output = parseCode("myTest4", src);
         }
         finally {
-            RequestContextHolder.setRequestAttributes(null);
+            RequestContextHolder.resetRequestAttributes();
         }
         String expected = makeImports() +
             "\n" +

diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/servlet/view/GroovyPageViewTests.groovy b/grails-test-suite-web/src/test/groovy/org/grails/web/servlet/view/GroovyPageViewTests.groovy
@@ -38,6 +38,6 @@ class GroovyPageViewTests extends GroovyTestCase {
     }
 
     void tearDown() {
-         RequestContextHolder.setRequestAttributes(null)
+         RequestContextHolder.resetRequestAttributes()
     }
 }
diff --git a/...st/src/main/groovy/org/grails/test/support/GrailsTestRequestEnvironmentInterceptor.groovy b/...st/src/main/groovy/org/grails/test/support/GrailsTestRequestEnvironmentInterceptor.groovy
@@ -56,7 +56,7 @@ class GrailsTestRequestEnvironmentInterceptor {
      * Removes the mock request environment
      */
     void destroy() {
-        RequestContextHolder.requestAttributes = null
+        RequestContextHolder.resetRequestAttributes()
     }
 
     /**

diff --git a/...src/test/groovy/org/codehaus/groovy/grails/web/servlet/mvc/GrailsParameterMapTests.groovy b/...src/test/groovy/org/codehaus/groovy/grails/web/servlet/mvc/GrailsParameterMapTests.groovy
@@ -39,7 +39,7 @@ class GrailsParameterMapTests extends GroovyTestCase {
             def cal = new GregorianCalendar(1971,6,16)
             assert val == cal.time
         } finally {
-            RequestContextHolder.setRequestAttributes(null)
+            RequestContextHolder.resetRequestAttributes()
         }
     }
     void testDateMethodMultipleFormats() {

diff --git a/...eb-gsp/src/test/groovy/org/grails/web/gsp/io/GrailsConventionGroovyPageLocatorSpec.groovy b/...eb-gsp/src/test/groovy/org/grails/web/gsp/io/GrailsConventionGroovyPageLocatorSpec.groovy
@@ -97,7 +97,7 @@ class GrailsConventionGroovyPageLocatorSpec extends Specification {
             source == null
 
         cleanup:
-            RequestContextHolder.setRequestAttributes(null)
+            RequestContextHolder.resetRequestAttributes()
     }
 
     void "Test find view with controller instance and view name from plugin"() {

diff --git a/grails-web-taglib/src/test/groovy/org/grails/web/taglib/TagLibraryLookupSpec.groovy b/grails-web-taglib/src/test/groovy/org/grails/web/taglib/TagLibraryLookupSpec.groovy
@@ -53,7 +53,7 @@ class TagLibraryLookupSpec extends Specification {
 
 
         cleanup:"cleanup request context"
-            RequestContextHolder.setRequestAttributes(null)
+            RequestContextHolder.resetRequestAttributes()
 
     }
 }

diff --git a/...ings/src/test/groovy/org/codehaus/groovy/grails/web/mapping/DefaultUrlCreatorTests.groovy b/...ings/src/test/groovy/org/codehaus/groovy/grails/web/mapping/DefaultUrlCreatorTests.groovy
@@ -32,6 +32,6 @@ class DefaultUrlCreatorTests extends GroovyTestCase {
     }
 
     void tearDown() {
-        RequestContextHolder.setRequestAttributes(null)
+        RequestContextHolder.resetRequestAttributes()
     }
 }
diff --git a/...-mappings/src/test/groovy/org/codehaus/groovy/grails/web/mapping/LinkGeneratorSpec.groovy b/...-mappings/src/test/groovy/org/codehaus/groovy/grails/web/mapping/LinkGeneratorSpec.groovy
@@ -271,7 +271,7 @@ class LinkGeneratorSpec extends Specification {
 
 
     void cleanup() {
-        RequestContextHolder.setRequestAttributes(null)
+        RequestContextHolder.resetRequestAttributes()
     }
 
     protected getGenerator(boolean cache=false) {

diff --git a/...st/groovy/org/codehaus/groovy/grails/web/servlet/mvc/UrlMappingsHandlerMappingSpec.groovy b/...st/groovy/org/codehaus/groovy/grails/web/servlet/mvc/UrlMappingsHandlerMappingSpec.groovy
@@ -49,7 +49,7 @@ class UrlMappingsHandlerMappingSpec extends AbstractUrlMappingsSpec{
     }
 
     void cleanup() {
-        RequestContextHolder.setRequestAttributes(null)
+        RequestContextHolder.resetRequestAttributes()
     }
 }
 

diff --git a/...eb/src/test/groovy/org/codehaus/groovy/grails/web/context/ServletContextHolderSpec.groovy b/...eb/src/test/groovy/org/codehaus/groovy/grails/web/context/ServletContextHolderSpec.groovy
@@ -12,7 +12,7 @@ class ServletContextHolderSpec extends Specification {
 
     void cleanup() {
         ServletContextHolder.setServletContext(null)
-        RequestContextHolder.setRequestAttributes(null)
+        RequestContextHolder.resetRequestAttributes()
     }
 
     def "Test get set servlet context"() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,7 +53,7 @@ class TagLibraryLookupSpec extends Specification { @@
             cleanup:"cleanup request context"
-                RequestContextHolder.setRequestAttributes(null)
+                RequestContextHolder.resetRequestAttributes()
         }
     }
@@ Expand Down @@