root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Further improve thread safety for attributes in DefaultTestContext 

Issue: SPR-5863
This commit is contained in:
Sam Brannen 2016-09-05 13:34:25 +02:00
parent 5755b67325
commit fbfad8695e
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
spring-test/src/main/java/org/springframework/test/context/support/DefaultTestContext.java
View File

@ -41,7 +41,7 @@ public class DefaultTestContext implements TestContext {
private static final long serialVersionUID = -5827157174866681233L;
private final Map<String, Object> attributes = new ConcurrentHashMap<>(0);
private final Map<String, Object> attributes = new ConcurrentHashMap<>(4);
private final CacheAwareContextLoaderDelegate cacheAwareContextLoaderDelegate;
@ -58,15 +58,17 @@ public class DefaultTestContext implements TestContext {
/**
* <em>Copy constructor</em> for creating a new {@code DefaultTestContext}
* based on the immutable state and <em>attributes</em> of the supplied context.
*
* <p><em>Immutable state</em> includes all arguments supplied to
* {@link #DefaultTestContext(Class, MergedContextConfiguration, CacheAwareContextLoaderDelegate)}.
* based on the <em>attributes</em> and immutable state of the supplied context.
* <p><em>Immutable state</em> includes all arguments supplied to the
* {@linkplain #DefaultTestContext(Class, MergedContextConfiguration,
* CacheAwareContextLoaderDelegate) standard constructor}.
* @throws NullPointerException if the supplied {@code DefaultTestContext}
* is {@code null}
*/
public DefaultTestContext(DefaultTestContext testContext) {
this(testContext.testClass, testContext.mergedContextConfiguration,
testContext.cacheAwareContextLoaderDelegate);
testContext.attributes.forEach(this.attributes::put);
this.attributes.putAll(testContext.attributes);
}
/**
@ -144,11 +146,13 @@ public class DefaultTestContext implements TestContext {
@Override
public void setAttribute(String name, Object value) {
Assert.notNull(name, "Name must not be null");
synchronized (this.attributes) {
if (value != null) {
this.attributes.put(name, value);
}
else {
removeAttribute(name);
this.attributes.remove(name);
}
}
}
@ -172,8 +176,10 @@ public class DefaultTestContext implements TestContext {
@Override
public String[] attributeNames() {
synchronized (this.attributes) {
return this.attributes.keySet().stream().toArray(String[]::new);
}
}
/**