Using Object instead of a specific type irritates some thread safety …

…tests. Fix that. RELNOTES=n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=172504355
google · Oct 17, 2017 · 01d18f2 · 01d18f2
1 parent 2f63703
commit 01d18f2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/android/guava/src/com/google/common/util/concurrent/Striped.java b/android/guava/src/com/google/common/util/concurrent/Striped.java
@@ -321,9 +321,9 @@ private static final class WeakSafeLock extends ForwardingLock {
     private final Lock delegate;
 
     @SuppressWarnings("unused")
-    private final Object strongReference;
+    private final WeakSafeReadWriteLock strongReference;
 
-    WeakSafeLock(Lock delegate, Object strongReference) {
+    WeakSafeLock(Lock delegate, WeakSafeReadWriteLock strongReference) {
       this.delegate = delegate;
       this.strongReference = strongReference;
     }
@@ -344,9 +344,9 @@ private static final class WeakSafeCondition extends ForwardingCondition {
     private final Condition delegate;
 
     @SuppressWarnings("unused")
-    private final Object strongReference;
+    private final WeakSafeReadWriteLock strongReference;
 
-    WeakSafeCondition(Condition delegate, Object strongReference) {
+    WeakSafeCondition(Condition delegate, WeakSafeReadWriteLock strongReference) {
       this.delegate = delegate;
       this.strongReference = strongReference;
     }

diff --git a/guava/src/com/google/common/util/concurrent/Striped.java b/guava/src/com/google/common/util/concurrent/Striped.java
@@ -321,9 +321,9 @@ private static final class WeakSafeLock extends ForwardingLock {
     private final Lock delegate;
 
     @SuppressWarnings("unused")
-    private final Object strongReference;
+    private final WeakSafeReadWriteLock strongReference;
 
-    WeakSafeLock(Lock delegate, Object strongReference) {
+    WeakSafeLock(Lock delegate, WeakSafeReadWriteLock strongReference) {
       this.delegate = delegate;
       this.strongReference = strongReference;
     }
@@ -344,9 +344,9 @@ private static final class WeakSafeCondition extends ForwardingCondition {
     private final Condition delegate;
 
     @SuppressWarnings("unused")
-    private final Object strongReference;
+    private final WeakSafeReadWriteLock strongReference;
 
-    WeakSafeCondition(Condition delegate, Object strongReference) {
+    WeakSafeCondition(Condition delegate, WeakSafeReadWriteLock strongReference) {
       this.delegate = delegate;
       this.strongReference = strongReference;
     }