You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2020/04/29 15:41:47 UTC

[sling-org-apache-sling-installer-factory-feature] branch master updated: Correctly configure caching directory

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-feature.git


The following commit(s) were added to refs/heads/master by this push:
     new 542240c  Correctly configure caching directory
542240c is described below

commit 542240c4b230d78d27926119db053b288186f20e
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Apr 29 17:41:32 2020 +0200

    Correctly configure caching directory
---
 .../installer/factory/model/impl/FeatureModelInstallerPlugin.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/sling/installer/factory/model/impl/FeatureModelInstallerPlugin.java b/src/main/java/org/apache/sling/installer/factory/model/impl/FeatureModelInstallerPlugin.java
index 3c1b870..cc86f97 100644
--- a/src/main/java/org/apache/sling/installer/factory/model/impl/FeatureModelInstallerPlugin.java
+++ b/src/main/java/org/apache/sling/installer/factory/model/impl/FeatureModelInstallerPlugin.java
@@ -108,10 +108,10 @@ public class FeatureModelInstallerPlugin implements InstallTaskFactory, Resource
         this.storageDirectory = this.bundleContext.getDataFile("repository");
         final ArtifactManagerConfig amCfg = new ArtifactManagerConfig();
         amCfg.setUseMvn(config.useMvn());
-        final List<String> repos = new ArrayList<>(Arrays.asList(amCfg.getRepositoryUrls()));
         if (this.storageDirectory != null) {
-            repos.add(this.storageDirectory.toURI().toURL().toExternalForm());
+            amCfg.setCacheDirectory(storageDirectory);
         }
+        final List<String> repos = new ArrayList<>(Arrays.asList(amCfg.getRepositoryUrls()));
         if (config.repositories() != null && config.repositories().length > 0) {
             for (final String r : config.repositories()) {
                 if (!r.trim().isEmpty()) {