From 5732bddf17f62f42c291ea83df4c4775ae5325aa Mon Sep 17 00:00:00 2001 From: zhanglei-1987 <31624476+zhanglei-1987@users.noreply.github.com> Date: Thu, 14 Apr 2022 21:18:04 +0800 Subject: [PATCH] Update DefaultRepositoryCacheManager.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Allow customization ‘dataFilePattern’ --- .../core/cache/DefaultRepositoryCacheManager.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java b/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java index 497a5363f..677f8bc84 100644 --- a/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java +++ b/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java @@ -110,7 +110,7 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv private String ivyPattern; - private String dataFilePattern = DEFAULT_DATA_FILE_PATTERN; + private String dataFilePattern; private String artifactPattern; @@ -223,6 +223,16 @@ public void setDefaultTTL(String defaultTTL) { } public String getDataFilePattern() { + + if (dataFilePattern == null) { + if (settings != null) { + dataFilePattern = settings.getVariable("ivy.cache.ivydata.pattern"); + } + if (dataFilePattern == null) { + dataFilePattern = DEFAULT_DATA_FILE_PATTERN; + } + } + return dataFilePattern; }