aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/junit/rules/TestName.java
diff options
context:
space:
mode:
authorPete Bentley <prb@google.com>2021-03-03 13:03:13 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-03 13:03:13 +0000
commitfcd81b3e3fa66cb13ab508ef8f9a4a8704309350 (patch)
tree9d0ef66d108d76d38341cb002d5a46f74299983f /src/main/java/org/junit/rules/TestName.java
parent23e304a839c5924c7ac7399076318adc511e9985 (diff)
parentb6446bec0ab6e17c7e047f5063201f66c7eaf8e2 (diff)
downloadjunit-fcd81b3e3fa66cb13ab508ef8f9a4a8704309350.tar.gz
Merge changes I578a2676,I4b37c2d0,Id1e2d638,I1ebe37da,I6135799c am: b6446bec0a
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1613132 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I88041ad8242f07c65db7bbc3b8167363b604af63
Diffstat (limited to 'src/main/java/org/junit/rules/TestName.java')
-rw-r--r--src/main/java/org/junit/rules/TestName.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/junit/rules/TestName.java b/src/main/java/org/junit/rules/TestName.java
index bf72602..e2ebc2e 100644
--- a/src/main/java/org/junit/rules/TestName.java
+++ b/src/main/java/org/junit/rules/TestName.java
@@ -25,7 +25,7 @@ import org.junit.runner.Description;
* @since 4.7
*/
public class TestName extends TestWatcher {
- private String name;
+ private volatile String name;
@Override
protected void starting(Description d) {