Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid unnecessary synchronization in ContextCache, plus forward-ported polishing

Browse Source 
Issue: SPR-12409
This commit is contained in:
Juergen Hoeller
2014-11-06 17:15:30 +01:00
parent 6a96850aa7
commit 74500ec8da
7 changed files with 130 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-test/src/test/java/org/springframework/test/context/TestContextTestUtils.java
View File

@@ -24,21 +24,15 @@ package org.springframework.test.context;
*/
public abstract class TestContextTestUtils {
private TestContextTestUtils() {
/* no-op */
}
public static TestContext buildTestContext(Class<?> testClass, ContextCache contextCache) {
CacheAwareContextLoaderDelegate cacheAwareContextLoaderDelegate = new DefaultCacheAwareContextLoaderDelegate(
contextCache);
return buildTestContext(testClass, null, cacheAwareContextLoaderDelegate);
return buildTestContext(testClass, new DefaultCacheAwareContextLoaderDelegate(contextCache));
}
public static TestContext buildTestContext(Class<?> testClass, String customDefaultContextLoaderClassName,
CacheAwareContextLoaderDelegate cacheAwareContextLoaderDelegate) {
public static TestContext buildTestContext(
Class<?> testClass, CacheAwareContextLoaderDelegate cacheAwareContextLoaderDelegate) {
BootstrapContext bootstrapContext = new DefaultBootstrapContext(testClass, cacheAwareContextLoaderDelegate);
TestContextBootstrapper testContextBootstrapper = BootstrapUtils.resolveTestContextBootstrapper(bootstrapContext);
return new DefaultTestContext(testContextBootstrapper);
}

1
spring-test/src/test/java/org/springframework/test/web/client/MockClientHttpRequestFactoryTests.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.test.web.client;
import java.net.URI;