Merge branch '2.3.x'

tombujok · Nov 12, 2013 · 3a341bc · 3a341bc
2 parents 9563bde + 6b02ced
commit 3a341bc
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/grails-test/src/main/groovy/org/codehaus/groovy/grails/test/spock/GrailsSpecTestType.groovy b/grails-test/src/main/groovy/org/codehaus/groovy/grails/test/spock/GrailsSpecTestType.groovy
@@ -27,6 +27,8 @@ import org.junit.runner.Request
 import org.junit.internal.requests.FilterRequest
 import org.junit.runner.manipulation.Filter
 import org.junit.runner.Description
+import org.objenesis.ObjenesisHelper
+import org.objenesis.ObjenesisBase
 
 @CompileStatic
 class GrailsSpecTestType extends GrailsTestTypeSupport {
@@ -36,6 +38,20 @@ class GrailsSpecTestType extends GrailsTestTypeSupport {
     private int featureCount = 0
     protected GrailsTestMode mode
 
+    static {
+        try {
+            final objStdField = ObjenesisHelper.getDeclaredField("OBJENESIS_STD")
+            objStdField.accessible = true
+            final objStd = objStdField.get(ObjenesisHelper)
+            final cacheField = ObjenesisBase.getDeclaredField("cache")
+            cacheField.accessible = true
+            cacheField.set(objStd, null)
+        } catch (Throwable e) {
+            // ignore, failed to patch
+        }
+
+    }
+
     GrailsSpecTestType(String name, String relativeSourcePath) {
         super(name, relativeSourcePath)
     }