Skip to content

Commit 5b8bca9

Browse files
committed
fix(RepositoryUrl): update default value VCS_HOST
1. Update the default value for `SW360Utils.readConfig(VCS_HOSTS,"[]")` 2. Before using the static `KNOWN_VCS_HOSTS`, check if the config was changed and update the map if required. Signed-off-by: Gaurav Mishra <mishra.gaurav@siemens.com>
1 parent 9720ece commit 5b8bca9

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

backend/common/src/main/java/org/eclipse/sw360/common/utils/RepositoryURL.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,20 @@
2525
public class RepositoryURL {
2626
private static final Logger log = LogManager.getLogger(RepositoryURL.class);
2727
private static final String SCHEMA_PATTERN = ".+://(\\w*(?:[\\-@.\\\\s,_:/][/(.\\-)A-Za-z0-9]+)*)";
28-
private static final String VCS_HOSTS_STRING = SW360Utils.readConfig(VCS_HOSTS,"");
29-
private static final Map<String, String> KNOWN_VCS_HOSTS = parseVCSHosts(VCS_HOSTS_STRING);
28+
private static String VCS_HOSTS_STRING = SW360Utils.readConfig(VCS_HOSTS,"[]");
29+
private static Map<String, String> KNOWN_VCS_HOSTS = parseVCSHosts(VCS_HOSTS_STRING);
3030

3131
public String processURL(String url) {
3232
return sanitizeVCS(url);
3333
}
3434

3535
private static String formatVCSUrl(String host, String[] urlParts) {
36+
if (VCS_HOSTS_STRING != null &&
37+
!VCS_HOSTS_STRING.equals(SW360Utils.readConfig(VCS_HOSTS, "[]"))) {
38+
// Config has updated, update the cache
39+
VCS_HOSTS_STRING = SW360Utils.readConfig(VCS_HOSTS,"[]");
40+
KNOWN_VCS_HOSTS = parseVCSHosts(VCS_HOSTS_STRING);
41+
}
3642
String formatString = KNOWN_VCS_HOSTS.get(host);
3743

3844
int paramCount = formatString.split("%s", -1).length - 1;

0 commit comments

Comments
 (0)