Cache preloaded distributions.

Author: dkocher

core/src/main/java/ch/cyberduck/core/features/Scheduler.java

@@ -17,6 +17,8 @@
 
 import ch.cyberduck.core.PasswordCallback;
 
+import org.apache.commons.lang3.concurrent.ConcurrentUtils;
+
 import java.util.concurrent.Future;
 
 @Optional
@@ -35,4 +37,21 @@ public interface Scheduler<R> {
      * Shutdown thread pool
      */
     void shutdown(boolean gracefully);
+
+    Scheduler noop = new Scheduler() {
+        @Override
+        public Future repeat(final PasswordCallback callback) {
+            return ConcurrentUtils.constantFuture(null);
+        }
+
+        @Override
+        public Future execute(final PasswordCallback callback) {
+            return ConcurrentUtils.constantFuture(null);
+        }
+
+        @Override
+        public void shutdown(final boolean gracefully) {
+        //
+        }
+    };
 }

openstack/src/main/java/ch/cyberduck/core/openstack/SwiftSession.java

@@ -66,19 +66,28 @@ public class SwiftSession extends HttpSession<Client> {
             = new SwiftRegionService(this);
 
     private final Map<Region, AccountInfo> accounts = new ConcurrentHashMap<>();
+    private final Map<Path, Set<Distribution>> distributions = new ConcurrentHashMap<>();
 
     private final DelegatingSchedulerFeature scheduler = new DelegatingSchedulerFeature(
-            new SwiftAccountLoader(this) {
+            new HostPreferences(host).getBoolean("openstack.account.preload") ? new SwiftAccountLoader(this) {
                 @Override
                 protected Map<Region, AccountInfo> operate(final PasswordCallback callback) throws BackgroundException {
                     final Map<Region, AccountInfo> result = super.operate(callback);
                     // Only executed single time
                     accounts.putAll(result);
                     return result;
                 }
-            }, new SwiftDistributionConfigurationLoader(this)
+            } : Scheduler.noop,
+            new HostPreferences(host).getBoolean("openstack.cdn.preload") ? new SwiftDistributionConfigurationLoader(this) {
+                @Override
+                protected Map<Path, Set<Distribution>> operate(final PasswordCallback callback) throws BackgroundException {
+                    final Map<Path, Set<Distribution>> result = super.operate(callback);
+                    // Only executed single time
+                    distributions.putAll(result);
+                    return result;
+                }
+            } : Scheduler.noop
     );
-    private final Map<Path, Set<Distribution>> distributions = new ConcurrentHashMap<>();
 
     public SwiftSession(final Host host, final X509TrustManager trust, final X509KeyManager key) {
         super(host, trust, key);
@@ -210,10 +219,7 @@ public Distribution read(final Path container, final Distribution.Method method,
             return (T) new SwiftAttributesFinderFeature(this, regionService);
         }
         if(type == Scheduler.class) {
-            if(new HostPreferences(host).getBoolean("openstack.accounts.preload")) {
-                return (T) scheduler;
-            }
-            return null;
+            return (T) scheduler;
         }
         return super._getFeature(type);
     }