1 files changed, 8 insertions, 0 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/Container.java b/container-core/src/main/java/com/yahoo/container/Container.java
index 3d3bf221528..47731761630 100755
--- a/container-core/src/main/java/com/yahoo/container/Container.java
+++ b/container-core/src/main/java/com/yahoo/container/Container.java
@@ -24,6 +24,7 @@ import java.util.logging.Logger;
 public class Container {
 
     private volatile boolean usingCustomFileAcquirer = false;
+    private volatile boolean disabledUrlDownloader = false;
 
     private volatile ComponentRegistry<RequestHandler> requestHandlerRegistry;
     private volatile ComponentRegistry<ClientProvider> clientProviderRegistry;
@@ -132,8 +133,15 @@ public class Container {
     }
 
     public void setupUrlDownloader() {
+        if (disabledUrlDownloader) {
+            return;
+        }
         this.urlDownloader = new UrlDownloader();
         ConfigTransformer.setUrlDownloader(urlDownloader);
     }
 
+    public void disableUrlDownloader() {
+        disabledUrlDownloader = true;
+    }
+
 }