Don't allocate multiple ImmediateCancelledFuture instances if cancell…

…ation causes are not enabled PiperOrigin-RevId: 431542091
google · Feb 28, 2022 · ac11adc · ac11adc
1 parent 1962106
commit ac11adc
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 20 deletions.
diff --git a/android/guava/src/com/google/common/util/concurrent/AbstractFuture.java b/android/guava/src/com/google/common/util/concurrent/AbstractFuture.java
@@ -78,7 +78,7 @@ public abstract class AbstractFuture<V extends @Nullable Object> extends Interna
     implements ListenableFuture<V> {
   // NOTE: Whenever both tests are cheap and functional, it's faster to use &, | instead of &&, ||
 
-  static final boolean GENERATE_CANCELLATION_CAUSES;
+  private static final boolean GENERATE_CANCELLATION_CAUSES;
 
   static {
     // System.getProperty may throw if the security policy does not permit access.

diff --git a/android/guava/src/com/google/common/util/concurrent/Futures.java b/android/guava/src/com/google/common/util/concurrent/Futures.java
@@ -170,11 +170,7 @@ private Futures() {}
    * @since 14.0
    */
   public static <V extends @Nullable Object> ListenableFuture<V> immediateCancelledFuture() {
-    ListenableFuture<Object> instance = ImmediateCancelledFuture.INSTANCE;
-    if (instance != null) {
-      return (ListenableFuture<V>) instance;
-    }
-    return new ImmediateCancelledFuture<>();
+    return new ImmediateCancelledFuture<V>();
   }
 
   /**

diff --git a/android/guava/src/com/google/common/util/concurrent/ImmediateFuture.java b/android/guava/src/com/google/common/util/concurrent/ImmediateFuture.java
@@ -98,9 +98,6 @@ static final class ImmediateFailedFuture<V extends @Nullable Object> extends Tru
   }
 
   static final class ImmediateCancelledFuture<V extends @Nullable Object> extends TrustedFuture<V> {
-    static final @Nullable ImmediateCancelledFuture<Object> INSTANCE =
-        AbstractFuture.GENERATE_CANCELLATION_CAUSES ? null : new ImmediateCancelledFuture<>();
-
     ImmediateCancelledFuture() {
       cancel(false);
     }

diff --git a/...google/common/util/concurrent/super/com/google/common/util/concurrent/AbstractFuture.java b/...google/common/util/concurrent/super/com/google/common/util/concurrent/AbstractFuture.java
@@ -40,8 +40,6 @@
 public abstract class AbstractFuture<V> extends InternalFutureFailureAccess
     implements ListenableFuture<V> {
 
-  static final boolean GENERATE_CANCELLATION_CAUSES = false;
-
   /**
    * Tag interface marking trusted subclasses. This enables some optimizations. The implementation
    * of this interface must also be an AbstractFuture and must not override or expose for overriding

diff --git a/guava/src/com/google/common/util/concurrent/AbstractFuture.java b/guava/src/com/google/common/util/concurrent/AbstractFuture.java
@@ -78,7 +78,7 @@ public abstract class AbstractFuture<V extends @Nullable Object> extends Interna
     implements ListenableFuture<V> {
   // NOTE: Whenever both tests are cheap and functional, it's faster to use &, | instead of &&, ||
 
-  static final boolean GENERATE_CANCELLATION_CAUSES;
+  private static final boolean GENERATE_CANCELLATION_CAUSES;
 
   static {
     // System.getProperty may throw if the security policy does not permit access.

diff --git a/guava/src/com/google/common/util/concurrent/Futures.java b/guava/src/com/google/common/util/concurrent/Futures.java
@@ -172,11 +172,7 @@ private Futures() {}
    * @since 14.0
    */
   public static <V extends @Nullable Object> ListenableFuture<V> immediateCancelledFuture() {
-    ListenableFuture<Object> instance = ImmediateCancelledFuture.INSTANCE;
-    if (instance != null) {
-      return (ListenableFuture<V>) instance;
-    }
-    return new ImmediateCancelledFuture<>();
+    return new ImmediateCancelledFuture<V>();
   }
 
   /**

diff --git a/guava/src/com/google/common/util/concurrent/ImmediateFuture.java b/guava/src/com/google/common/util/concurrent/ImmediateFuture.java
@@ -98,9 +98,6 @@ static final class ImmediateFailedFuture<V extends @Nullable Object> extends Tru
   }
 
   static final class ImmediateCancelledFuture<V extends @Nullable Object> extends TrustedFuture<V> {
-    static final @Nullable ImmediateCancelledFuture<Object> INSTANCE =
-        AbstractFuture.GENERATE_CANCELLATION_CAUSES ? null : new ImmediateCancelledFuture<>();
-
     ImmediateCancelledFuture() {
       cancel(false);
     }