Apache Solr open-source search software
SOLR-13608: Sync on TrackingBackupRepo NL changes (#59)
Jason Gerlowski06fad780dad9
diff --git a/solr/core/src/java/org/apache/solr/core/backup/repository/BackupRepositoryFactory.java b/solr/core/src/java/org/apache/solr/core/backup/repository/BackupRepositoryFactory.javaindex 6d57a90e856..46143ca2083 100644--- a/solr/core/src/java/org/apache/solr/core/backup/repository/BackupRepositoryFactory.java+++ b/solr/core/src/java/org/apache/solr/core/backup/repository/BackupRepositoryFactory.java@@ -73,9 +73,15 @@ public class BackupRepositoryFactory {"Could not find a backup repository with name " + name);BackupRepository result = loader.newInstance(repo.className, BackupRepository.class);- if ("trackingBackupRepository".equals(name) && repo.initArgs.get("factory") == null) {- repo.initArgs.add("factory", this);- repo.initArgs.add("loader", loader);+ if ("trackingBackupRepository".equals(name)) {+ // newInstance can be called by multiple threads, synchronization prevents simultaneous multi-threaded 'adds' from+ // corrupting the namedlist+ synchronized (repo.initArgs) {+ if (repo.initArgs.get("factory") == null) {+ repo.initArgs.add("factory", this);+ repo.initArgs.add("loader", loader);+ }+ }}result.init(repo.initArgs);