Copy collections to avoid false sharing (#5746)

aws · Dec 9, 2024 · 142b670 · 142b670
1 parent 07dbaeb
commit 142b670
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/core/retries/src/main/java/software/amazon/awssdk/retries/internal/BaseRetryStrategy.java b/core/retries/src/main/java/software/amazon/awssdk/retries/internal/BaseRetryStrategy.java
@@ -63,15 +63,17 @@ public abstract class BaseRetryStrategy implements DefaultAwareRetryStrategy {
 
     BaseRetryStrategy(Logger log, Builder builder) {
         this.log = log;
-        this.retryPredicates = Collections.unmodifiableList(Validate.paramNotNull(builder.retryPredicates, "retryPredicates"));
+        this.retryPredicates = Collections.unmodifiableList(
+            Validate.paramNotNull(new ArrayList<>(builder.retryPredicates), "retryPredicates"));
         this.maxAttempts = Validate.isPositive(builder.maxAttempts, "maxAttempts");
         this.circuitBreakerEnabled = builder.circuitBreakerEnabled == null || builder.circuitBreakerEnabled;
         this.backoffStrategy = Validate.paramNotNull(builder.backoffStrategy, "backoffStrategy");
         this.throttlingBackoffStrategy = Validate.paramNotNull(builder.throttlingBackoffStrategy, "throttlingBackoffStrategy");
         this.treatAsThrottling = Validate.paramNotNull(builder.treatAsThrottling, "treatAsThrottling");
         this.exceptionCost = Validate.paramNotNull(builder.exceptionCost, "exceptionCost");
         this.tokenBucketStore = Validate.paramNotNull(builder.tokenBucketStore, "tokenBucketStore");
-        this.defaultsAdded = Validate.paramNotNull(builder.defaultsAdded, "defaultsAdded");
+        this.defaultsAdded = Collections.unmodifiableSet(
+            Validate.paramNotNull(new HashSet<>(builder.defaultsAdded), "defaultsAdded"));
         this.useClientDefaults = builder.useClientDefaults == null || builder.useClientDefaults;
     }
 
@@ -425,7 +427,7 @@ public abstract static class Builder implements DefaultAwareRetryStrategy.Builde
             this.throttlingBackoffStrategy = strategy.throttlingBackoffStrategy;
             this.treatAsThrottling = strategy.treatAsThrottling;
             this.tokenBucketStore = strategy.tokenBucketStore;
-            this.defaultsAdded = strategy.defaultsAdded;
+            this.defaultsAdded = new HashSet<>(strategy.defaultsAdded);
             this.useClientDefaults = strategy.useClientDefaults;
         }