[java-shib-shared] branch main updated: JSSH-71 Remove the impact of the DestructableComponent Interface

[Codeberg]

This is an automated email from the git hooks/post-receive script.

codeberg pushed a commit to branch main
in repository java-shib-shared.

View the commit online:
https://codeberg.org/Shibboleth/java-shib-shared/commit/9ee77deb81eb6180d3eedc2d497410af4fe6f949

The following commit(s) were added to refs/heads/main by this push:
     new 9ee77deb JSSH-71 Remove the impact of the DestructableComponent Interface
9ee77deb is described below

commit 9ee77deb81eb6180d3eedc2d497410af4fe6f949
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Aug 8 13:39:42 2026 +0100

    JSSH-71 Remove the impact of the DestructableComponent Interface
    
    https://shibboleth.atlassian.net/browse/JSSH-71
    
    Close the loop on FileCachingHttpClientFactoryBean,
    FileCachingHttpClientBuilder and
    FileCachingHttpClientBuilder$StorageManagingHttpClient
---
 .../spring/httpclient/factory/FileCachingHttpClientFactoryBean.java     | 1 -
 .../net/shibboleth/shared/httpclient/FileCachingHttpClientBuilder.java  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/FileCachingHttpClientFactoryBean.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/FileCachingHttpClientFactoryBean.java
index bd8a68e4..9f4efa5e 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/FileCachingHttpClientFactoryBean.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/FileCachingHttpClientFactoryBean.java
@@ -22,7 +22,6 @@ import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.FactoryBean;
 
 import net.shibboleth.shared.annotation.OnTeardown;
-import net.shibboleth.shared.component.DestructableComponent;
 import net.shibboleth.shared.component.InitializableComponent;
 import net.shibboleth.shared.httpclient.FileCachingHttpClientBuilder;
 import net.shibboleth.shared.primitive.AnnotationsSupport;
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilder.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilder.java
index 83715fc5..eedd7eac 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilder.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilder.java
@@ -374,7 +374,7 @@ public class FileCachingHttpClientBuilder extends HttpClientBuilder {
          * Method to tear down the object.
          */
         @OnTeardown
-        public final void teardownStorageManagingHttpClient() {
+        public synchronized void teardownStorageManagingHttpClient() {
 
             if (isDestroyed()) {
                 return;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.