From bfa6d2989bb8dabe1a578190f4b5356fdfe39209 Mon Sep 17 00:00:00 2001
From: Devin Smith <devinsmith@deephaven.io>
Date: Thu, 22 May 2025 17:03:33 -0700
Subject: [PATCH] AWS: Skip cleanup of analytics accelerator when disabled

If an S3AsyncClient has been used from S3FileIO and the analytics accelerator is disabled (is disabled by default), the S3FileIO may throw an exception during closing if the analytics accelerator is not on the classpath.

Closes #13133
---
 .../main/java/org/apache/iceberg/aws/s3/PrefixedS3Client.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/aws/src/main/java/org/apache/iceberg/aws/s3/PrefixedS3Client.java b/aws/src/main/java/org/apache/iceberg/aws/s3/PrefixedS3Client.java
index b0b65ab8ea86..400792cf976c 100644
--- a/aws/src/main/java/org/apache/iceberg/aws/s3/PrefixedS3Client.java
+++ b/aws/src/main/java/org/apache/iceberg/aws/s3/PrefixedS3Client.java
@@ -114,7 +114,9 @@ public void close() {
 
     if (null != s3AsyncClient) {
       // cleanup usage in analytics accelerator if any
-      AnalyticsAcceleratorUtil.cleanupCache(s3AsyncClient, s3FileIOProperties);
+      if (s3FileIOProperties().isS3AnalyticsAcceleratorEnabled()) {
+        AnalyticsAcceleratorUtil.cleanupCache(s3AsyncClient, s3FileIOProperties);
+      }
       s3AsyncClient.close();
     }
   }