Logout and close connection handling.

dkocher · dkocher · commit 9f618245ad1b · 2025-11-04T10:35:45.000+01:00
diff --git a/azure/src/main/java/ch/cyberduck/core/azure/AzureSession.java b/azure/src/main/java/ch/cyberduck/core/azure/AzureSession.java
@@ -16,6 +16,7 @@
  */
 
 import ch.cyberduck.core.Credentials;
+import ch.cyberduck.core.DefaultIOExceptionMappingService;
 import ch.cyberduck.core.Host;
 import ch.cyberduck.core.HostKeyCallback;
 import ch.cyberduck.core.HostUrlProvider;
@@ -38,6 +39,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import java.io.IOException;
 import java.util.Collections;
 
 import com.azure.core.credential.AzureSasCredential;
@@ -142,8 +144,20 @@ public void login(final LoginCallback prompt, final CancelCallback cancel) throw
     }
 
     @Override
-    protected void logout() {
-        //
+    public void close() throws BackgroundException {
+        try {
+            if(client != null) {
+                try {
+                    ((ApacheHttpClient) client.getHttpPipeline().getHttpClient()).getHttpClient().close();
+                }
+                catch(IOException e) {
+                    throw new DefaultIOExceptionMappingService().map(e);
+                }
+            }
+        }
+        finally {
+            super.close();
+        }
     }
 
     @Override
diff --git a/azure/src/main/java/ch/cyberduck/core/azure/apache/ApacheHttpClient.java b/azure/src/main/java/ch/cyberduck/core/azure/apache/ApacheHttpClient.java
@@ -20,6 +20,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
 import org.apache.http.entity.ByteArrayEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.protocol.HTTP;
 import reactor.core.publisher.Mono;
@@ -29,12 +30,16 @@
 import java.net.URL;
 
 public class ApacheHttpClient implements HttpClient {
-    private final org.apache.http.client.HttpClient httpClient;
+    private final CloseableHttpClient httpClient;
 
     public ApacheHttpClient(final HttpClientBuilder builder) {
         this.httpClient = builder.build();
     }
 
+    public CloseableHttpClient getHttpClient() {
+        return httpClient;
+    }
+
     public Mono<HttpResponse> send(final HttpRequest azureRequest) {
         try {
             ApacheHttpRequest apacheRequest = new ApacheHttpRequest(azureRequest.getHttpMethod(), azureRequest.getUrl(),
diff --git a/backblaze/src/main/java/ch/cyberduck/core/b2/B2Session.java b/backblaze/src/main/java/ch/cyberduck/core/b2/B2Session.java
@@ -68,18 +68,24 @@ protected B2ApiClient connect(final ProxyFinder proxy, final HostKeyCallback key
     }
 
     @Override
-    public void logout() throws BackgroundException {
+    public void close() throws BackgroundException {
         try {
+            fileid.clear();
             client.close();
         }
         catch(IOException e) {
             throw new DefaultIOExceptionMappingService().map(e);
         }
         finally {
-            fileid.clear();
+            super.close();
         }
     }
 
+    @Override
+    protected void disconnect() {
+        super.disconnect();
+    }
+
     @Override
     public void login(final LoginCallback prompt, final CancelCallback cancel) throws BackgroundException {
         try {
diff --git a/box/src/main/java/ch/cyberduck/core/box/BoxSession.java b/box/src/main/java/ch/cyberduck/core/box/BoxSession.java
@@ -87,15 +87,16 @@ public void login(final LoginCallback prompt, final CancelCallback cancel) throw
     }
 
     @Override
-    protected void logout() throws BackgroundException {
+    public void close() throws BackgroundException {
         try {
+            fileid.clear();
             client.close();
         }
         catch(IOException e) {
             throw new DefaultIOExceptionMappingService().map(e);
         }
         finally {
-            fileid.clear();
+            super.close();
         }
     }
 
diff --git a/brick/src/main/java/ch/cyberduck/core/brick/BrickSession.java b/brick/src/main/java/ch/cyberduck/core/brick/BrickSession.java
@@ -111,13 +111,18 @@ public void login(final LoginCallback prompt, final CancelCallback cancel) throw
     }
 
     @Override
-    protected void logout() throws BackgroundException {
+    public void close() throws BackgroundException {
         try {
-            client.close();
+            if(client != null) {
+                client.close();
+            }
         }
         catch(IOException e) {
             throw new DefaultIOExceptionMappingService().map(e);
         }
+        finally {
+            super.close();
+        }
     }
 
     public Credentials pair(final Host bookmark, final ConnectionCallback alert, final LoginCallback prompt, final CancelCallback cancel,
diff --git a/core/src/test/java/ch/cyberduck/core/NullSession.java b/core/src/test/java/ch/cyberduck/core/NullSession.java
@@ -33,11 +33,6 @@ public void login(final LoginCallback prompt, final CancelCallback cancel) throw
         throw new LoginCanceledException();
     }
 
-    @Override
-    protected void logout() {
-        //
-    }
-
     @Override
     public AttributedList<Path> list(final Path folder, final ListProgressListener listener) throws BackgroundException {
         listener.chunk(folder, AttributedList.emptyList());
diff --git a/ctera/src/main/java/ch/cyberduck/core/ctera/CteraSession.java b/ctera/src/main/java/ch/cyberduck/core/ctera/CteraSession.java
@@ -228,10 +228,15 @@ protected void logout() throws BackgroundException {
         }
         finally {
             super.logout();
-            versionid.clear();
         }
     }
 
+    @Override
+    public void close() throws BackgroundException {
+        versionid.clear();
+        super.close();
+    }
+
     @Override
     @SuppressWarnings("unchecked")
     public <T> T _getFeature(final Class<T> type) {
diff --git a/deepbox/src/main/java/ch/cyberduck/core/deepbox/DeepboxSession.java b/deepbox/src/main/java/ch/cyberduck/core/deepbox/DeepboxSession.java
@@ -182,8 +182,15 @@ public DeepcloudApiClient getDeepcloudClient() {
     }
 
     @Override
-    protected void logout() {
-        client.getHttpClient().close();
+    public void close() throws BackgroundException {
+        try {
+            if(client != null) {
+                client.getHttpClient().close();
+            }
+        }
+        finally {
+            super.close();
+        }
     }
 
     @Override
diff --git a/dracoon/src/main/java/ch/cyberduck/core/sds/SDSSession.java b/dracoon/src/main/java/ch/cyberduck/core/sds/SDSSession.java
@@ -580,10 +580,17 @@ public int hashCode() {
     }
 
     @Override
-    protected void logout() {
-        scheduler.shutdown(false);
-        client.getHttpClient().close();
-        nodeid.clear();
+    public void close() throws BackgroundException {
+        try {
+            scheduler.shutdown(false);
+            nodeid.clear();
+            if(client != null) {
+                client.getHttpClient().close();
+            }
+        }
+        finally {
+            super.close();
+        }
     }
 
     @Override
diff --git a/dropbox/src/main/java/ch/cyberduck/core/dropbox/DropboxSession.java b/dropbox/src/main/java/ch/cyberduck/core/dropbox/DropboxSession.java
@@ -124,13 +124,16 @@ public void login(final LoginCallback prompt, final CancelCallback cancel) throw
     }
 
     @Override
-    protected void logout() throws BackgroundException {
+    public void close() throws BackgroundException {
         try {
             ((DropboxCommonsHttpRequestExecutor) client.getRequestConfig().getHttpRequestor()).close();
         }
         catch(IOException e) {
             throw new DefaultIOExceptionMappingService().map(e);
         }
+        finally {
+            super.close();
+        }
     }
 
     @Override
diff --git a/eue/src/main/java/ch/cyberduck/core/eue/EueSession.java b/eue/src/main/java/ch/cyberduck/core/eue/EueSession.java
@@ -214,15 +214,18 @@ public void login(final LoginCallback prompt, final CancelCallback cancel) throw
     }
 
     @Override
-    protected void logout() throws BackgroundException {
+    public void close() throws BackgroundException {
         try {
-            client.close();
+            resourceid.clear();
+            if(client != null) {
+                client.close();
+            }
         }
         catch(IOException e) {
             throw new DefaultIOExceptionMappingService().map(e);
         }
         finally {
-            resourceid.clear();
+            super.close();
         }
     }
 
diff --git a/googledrive/src/main/java/ch/cyberduck/core/googledrive/DriveSession.java b/googledrive/src/main/java/ch/cyberduck/core/googledrive/DriveSession.java
@@ -99,15 +99,16 @@ public void login(final LoginCallback prompt, final CancelCallback cancel) throw
     }
 
     @Override
-    protected void logout() throws BackgroundException {
+    public void close() throws BackgroundException {
         try {
+            fileid.clear();
             transport.shutdown();
         }
         catch(IOException e) {
             throw new DefaultIOExceptionMappingService().map(e);
         }
         finally {
-            fileid.clear();
+            super.close();
         }
     }
 
diff --git a/googlestorage/src/main/java/ch/cyberduck/core/googlestorage/GoogleStorageSession.java b/googlestorage/src/main/java/ch/cyberduck/core/googlestorage/GoogleStorageSession.java
@@ -81,13 +81,16 @@ public void login(final LoginCallback prompt, final CancelCallback cancel) throw
     }
 
     @Override
-    protected void logout() throws BackgroundException {
+    public void close() throws BackgroundException {
         try {
             transport.shutdown();
         }
         catch(IOException e) {
             throw new DefaultIOExceptionMappingService().map(e);
         }
+        finally {
+            super.close();
+        }
     }
 
     public HttpClient getHttpClient() {
diff --git a/irods/src/main/java/ch/cyberduck/core/irods/IRODSSession.java b/irods/src/main/java/ch/cyberduck/core/irods/IRODSSession.java
@@ -145,13 +145,16 @@ public void login(final LoginCallback prompt, final CancelCallback cancel) throw
     }
 
     @Override
-    protected void logout() throws BackgroundException {
+    public void close() throws BackgroundException {
         try {
             client.getIRODSSession().closeSession();
         }
         catch(JargonException e) {
             throw new IRODSExceptionMappingService().map(e);
         }
+        finally {
+            super.close();
+        }
     }
 
     @Override
diff --git a/manta/src/main/java/ch/cyberduck/core/manta/MantaSession.java b/manta/src/main/java/ch/cyberduck/core/manta/MantaSession.java
@@ -110,9 +110,14 @@ public void login(final LoginCallback prompt, final CancelCallback cancel) throw
     }
 
     @Override
-    protected void logout() {
-        if(client != null) {
-            client.closeWithWarning();
+    public void close() throws BackgroundException {
+        try {
+            if(client != null) {
+                client.closeQuietly();
+            }
+        }
+        finally {
+            super.close();
         }
     }
 
diff --git a/nio/src/main/java/ch/cyberduck/core/nio/LocalSession.java b/nio/src/main/java/ch/cyberduck/core/nio/LocalSession.java
@@ -112,6 +112,7 @@ public void login(final LoginCallback prompt, final CancelCallback cancel) throw
     protected void logout() throws BackgroundException {
         final Path home = new LocalHomeFinderFeature().find();
         LocalFactory.get(this.toPath(home).toString()).release(lock);
+        super.logout();
     }
 
     protected boolean isPosixFilesystem() {
diff --git a/onedrive/src/main/java/ch/cyberduck/core/onedrive/GraphSession.java b/onedrive/src/main/java/ch/cyberduck/core/onedrive/GraphSession.java
@@ -232,15 +232,18 @@ public void login(final LoginCallback prompt, final CancelCallback cancel) throw
     }
 
     @Override
-    protected void logout() throws BackgroundException {
+    public void close() throws BackgroundException {
         try {
-            client.getExecutor().close();
+            fileid.clear();
+            if(client != null) {
+                client.getExecutor().close();
+            }
         }
         catch(IOException e) {
             throw new DefaultIOExceptionMappingService().map(e);
         }
         finally {
-            fileid.clear();
+            super.close();
         }
     }
 
diff --git a/openstack/src/main/java/ch/cyberduck/core/openstack/SwiftSession.java b/openstack/src/main/java/ch/cyberduck/core/openstack/SwiftSession.java
@@ -101,14 +101,19 @@ protected Client connect(final ProxyFinder proxy, final HostKeyCallback key, fin
     }
 
     @Override
-    protected void logout() throws BackgroundException {
+    public void close() throws BackgroundException {
         try {
             scheduler.shutdown(false);
-            client.disconnect();
+            if(client != null) {
+                client.disconnect();
+            }
         }
         catch(IOException e) {
             throw new DefaultIOExceptionMappingService().map(e);
         }
+        finally {
+            super.close();
+        }
     }
 
     @Override
diff --git a/s3/src/main/java/ch/cyberduck/core/s3/S3Session.java b/s3/src/main/java/ch/cyberduck/core/s3/S3Session.java
@@ -132,14 +132,19 @@ public S3Session(final Host host, final X509TrustManager trust, final X509KeyMan
     }
 
     @Override
-    protected void logout() throws BackgroundException {
+    public void close() throws BackgroundException {
         try {
             scheduler.shutdown(false);
-            client.shutdown();
+            if(client != null) {
+                client.shutdown();
+            }
         }
         catch(ServiceException e) {
             throw new S3ExceptionMappingService().map(e);
         }
+        finally {
+            super.close();
+        }
     }
 
     protected XmlResponsesSaxParser getXmlResponseSaxParser() throws ServiceException {
diff --git a/smb/src/main/java/ch/cyberduck/core/smb/SMBSession.java b/smb/src/main/java/ch/cyberduck/core/smb/SMBSession.java
diff --git a/ssh/src/main/java/ch/cyberduck/core/sftp/SFTPSession.java b/ssh/src/main/java/ch/cyberduck/core/sftp/SFTPSession.java
diff --git a/storegate/src/main/java/ch/cyberduck/core/storegate/StoregateSession.java b/storegate/src/main/java/ch/cyberduck/core/storegate/StoregateSession.java
diff --git a/webdav/src/main/java/ch/cyberduck/core/dav/DAVSession.java b/webdav/src/main/java/ch/cyberduck/core/dav/DAVSession.java

Original file line number	Diff line number	Diff line change
`@@ -68,18 +68,24 @@ protected B2ApiClient connect(final ProxyFinder proxy, final HostKeyCallback key`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`@Override`
`71`		`- public void logout() throws BackgroundException {`
	`71`	`+ public void close() throws BackgroundException {`
`72`	`72`	`try {`
	`73`	`+ fileid.clear();`
`73`	`74`	`client.close();`
`74`	`75`	`}`
`75`	`76`	`catch(IOException e) {`
`76`	`77`	`throw new DefaultIOExceptionMappingService().map(e);`
`77`	`78`	`}`
`78`	`79`	`finally {`
`79`		`- fileid.clear();`
	`80`	`+ super.close();`
`80`	`81`	`}`
`81`	`82`	`}`
`82`	`83`
	`84`	`+ @Override`
	`85`	`+ protected void disconnect() {`
	`86`	`+ super.disconnect();`
	`87`	`+ }`
	`88`	`+`
`83`	`89`	`@Override`
`84`	`90`	`public void login(final LoginCallback prompt, final CancelCallback cancel) throws BackgroundException {`
`85`	`91`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -87,15 +87,16 @@ public void login(final LoginCallback prompt, final CancelCallback cancel) throw`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`@Override`
`90`		`- protected void logout() throws BackgroundException {`
	`90`	`+ public void close() throws BackgroundException {`
`91`	`91`	`try {`
	`92`	`+ fileid.clear();`
`92`	`93`	`client.close();`
`93`	`94`	`}`
`94`	`95`	`catch(IOException e) {`
`95`	`96`	`throw new DefaultIOExceptionMappingService().map(e);`
`96`	`97`	`}`
`97`	`98`	`finally {`
`98`		`- fileid.clear();`
	`99`	`+ super.close();`
`99`	`100`	`}`
`100`	`101`	`}`
`101`	`102`
Original file line number	Diff line number	Diff line change
`@@ -111,13 +111,18 @@ public void login(final LoginCallback prompt, final CancelCallback cancel) throw`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`@Override`
`114`		`- protected void logout() throws BackgroundException {`
	`114`	`+ public void close() throws BackgroundException {`
`115`	`115`	`try {`
`116`		`- client.close();`
	`116`	`+ if(client != null) {`
	`117`	`+ client.close();`
	`118`	`+ }`
`117`	`119`	`}`
`118`	`120`	`catch(IOException e) {`
`119`	`121`	`throw new DefaultIOExceptionMappingService().map(e);`
`120`	`122`	`}`
	`123`	`+ finally {`
	`124`	`+ super.close();`
	`125`	`+ }`
`121`	`126`	`}`
`122`	`127`
`123`	`128`	`public Credentials pair(final Host bookmark, final ConnectionCallback alert, final LoginCallback prompt, final CancelCallback cancel,`
Original file line number	Diff line number	Diff line change
`@@ -228,10 +228,15 @@ protected void logout() throws BackgroundException {`
`228`	`228`	`}`
`229`	`229`	`finally {`
`230`	`230`	`super.logout();`
`231`		`- versionid.clear();`
`232`	`231`	`}`
`233`	`232`	`}`
`234`	`233`
	`234`	`+ @Override`
	`235`	`+ public void close() throws BackgroundException {`
	`236`	`+ versionid.clear();`
	`237`	`+ super.close();`
	`238`	`+ }`
	`239`	`+`
`235`	`240`	`@Override`
`236`	`241`	`@SuppressWarnings("unchecked")`
`237`	`242`	`public <T> T _getFeature(final Class<T> type) {`
Original file line number	Diff line number	Diff line change
`@@ -124,13 +124,16 @@ public void login(final LoginCallback prompt, final CancelCallback cancel) throw`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`@Override`
`127`		`- protected void logout() throws BackgroundException {`
	`127`	`+ public void close() throws BackgroundException {`
`128`	`128`	`try {`
`129`	`129`	`((DropboxCommonsHttpRequestExecutor) client.getRequestConfig().getHttpRequestor()).close();`
`130`	`130`	`}`
`131`	`131`	`catch(IOException e) {`
`132`	`132`	`throw new DefaultIOExceptionMappingService().map(e);`
`133`	`133`	`}`
	`134`	`+ finally {`
	`135`	`+ super.close();`
	`136`	`+ }`
`134`	`137`	`}`
`135`	`138`
`136`	`139`	`@Override`