Synchronize on empty arrays instead of Integer instances.

Thanks to @ben-manes for [the tip](5f0e886#commitcomment-145062186). RELNOTES=n/a PiperOrigin-RevId: 660005124
google · Aug 6, 2024 · 91b6ebe · 91b6ebe
1 parent c784059
commit 91b6ebe
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/android/guava-tests/test/com/google/common/collect/SynchronizedDequeTest.java b/android/guava-tests/test/com/google/common/collect/SynchronizedDequeTest.java
@@ -39,7 +39,7 @@ protected Deque<String> create() {
 
   private static final class TestDeque<E> implements Deque<E> {
     private final Deque<E> delegate = Lists.newLinkedList();
-    public final Object mutex = new Integer(1); // something Serializable
+    public final Object mutex = new Object[0]; // something Serializable
 
     @Override
     public boolean offer(E o) {

diff --git a/android/guava-tests/test/com/google/common/collect/SynchronizedMapTest.java b/android/guava-tests/test/com/google/common/collect/SynchronizedMapTest.java
@@ -36,7 +36,7 @@
  * @author Mike Bostock
  */
 public class SynchronizedMapTest extends TestCase {
-  public final Object mutex = new Integer(1); // something Serializable
+  public final Object mutex = new Object[0]; // something Serializable
 
   protected <K, V> Map<K, V> create() {
     TestMap<K, V> inner = new TestMap<>(new HashMap<K, V>(), mutex);

diff --git a/android/guava-tests/test/com/google/common/collect/SynchronizedMultimapTest.java b/android/guava-tests/test/com/google/common/collect/SynchronizedMultimapTest.java
@@ -75,7 +75,7 @@ protected SetMultimap<String, String> create(Entry<String, String>[] entries) {
   private static final class TestMultimap<K, V> extends ForwardingSetMultimap<K, V>
       implements Serializable {
     final SetMultimap<K, V> delegate = HashMultimap.create();
-    public final Object mutex = new Integer(1); // something Serializable
+    public final Object mutex = new Object[0]; // something Serializable
 
     @Override
     protected SetMultimap<K, V> delegate() {

diff --git a/android/guava-tests/test/com/google/common/collect/SynchronizedSetTest.java b/android/guava-tests/test/com/google/common/collect/SynchronizedSetTest.java
@@ -38,7 +38,7 @@
  */
 public class SynchronizedSetTest extends TestCase {
 
-  public static final Object MUTEX = new Integer(1); // something Serializable
+  public static final Object MUTEX = new Object[0]; // something Serializable
 
   public static Test suite() {
     return SetTestSuiteBuilder.using(

diff --git a/android/guava-tests/test/com/google/common/collect/SynchronizedTableTest.java b/android/guava-tests/test/com/google/common/collect/SynchronizedTableTest.java
@@ -25,7 +25,7 @@
 public class SynchronizedTableTest extends AbstractTableTest<Character> {
   private static final class TestTable<R, C, V> implements Table<R, C, V>, Serializable {
     final Table<R, C, V> delegate = HashBasedTable.create();
-    public final Object mutex = new Integer(1); // something Serializable
+    public final Object mutex = new Object[0]; // something Serializable
 
     @Override
     public String toString() {

diff --git a/guava-tests/test/com/google/common/collect/SynchronizedDequeTest.java b/guava-tests/test/com/google/common/collect/SynchronizedDequeTest.java
@@ -39,7 +39,7 @@ protected Deque<String> create() {
 
   private static final class TestDeque<E> implements Deque<E> {
     private final Deque<E> delegate = Lists.newLinkedList();
-    public final Object mutex = new Integer(1); // something Serializable
+    public final Object mutex = new Object[0]; // something Serializable
 
     @Override
     public boolean offer(E o) {

diff --git a/guava-tests/test/com/google/common/collect/SynchronizedMapTest.java b/guava-tests/test/com/google/common/collect/SynchronizedMapTest.java
@@ -36,7 +36,7 @@
  * @author Mike Bostock
  */
 public class SynchronizedMapTest extends TestCase {
-  public final Object mutex = new Integer(1); // something Serializable
+  public final Object mutex = new Object[0]; // something Serializable
 
   protected <K, V> Map<K, V> create() {
     TestMap<K, V> inner = new TestMap<>(new HashMap<K, V>(), mutex);

diff --git a/guava-tests/test/com/google/common/collect/SynchronizedMultimapTest.java b/guava-tests/test/com/google/common/collect/SynchronizedMultimapTest.java
@@ -75,7 +75,7 @@ protected SetMultimap<String, String> create(Entry<String, String>[] entries) {
   private static final class TestMultimap<K, V> extends ForwardingSetMultimap<K, V>
       implements Serializable {
     final SetMultimap<K, V> delegate = HashMultimap.create();
-    public final Object mutex = new Integer(1); // something Serializable
+    public final Object mutex = new Object[0]; // something Serializable
 
     @Override
     protected SetMultimap<K, V> delegate() {

diff --git a/guava-tests/test/com/google/common/collect/SynchronizedSetTest.java b/guava-tests/test/com/google/common/collect/SynchronizedSetTest.java
@@ -40,7 +40,7 @@
  */
 public class SynchronizedSetTest extends TestCase {
 
-  public static final Object MUTEX = new Integer(1); // something Serializable
+  public static final Object MUTEX = new Object[0]; // something Serializable
 
   public static Test suite() {
     return SetTestSuiteBuilder.using(

diff --git a/guava-tests/test/com/google/common/collect/SynchronizedTableTest.java b/guava-tests/test/com/google/common/collect/SynchronizedTableTest.java
@@ -25,7 +25,7 @@
 public class SynchronizedTableTest extends AbstractTableTest<Character> {
   private static final class TestTable<R, C, V> implements Table<R, C, V>, Serializable {
     final Table<R, C, V> delegate = HashBasedTable.create();
-    public final Object mutex = new Integer(1); // something Serializable
+    public final Object mutex = new Object[0]; // something Serializable
 
     @Override
     public String toString() {