Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-16877: Allow empty ZK data in Backup (#1764)

paulb6350eb539556
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 04e21853dfb..5c974d076d5 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -316,6 +316,8 @@ Bug Fixes
* SOLR-16861: Coordinator node does not have the correct collection/core in MDCLoggingContext (Patson Luk)
+* SOLR-16877: BackupManager now allows ConfigSet "files" to be empty, which previously caused NPEs. (Paul Blanchaert via Houston Putman)
+
Dependency Upgrades
---------------------
* PR#1494: Upgrade forbiddenapis to 3.5 (Uwe Schindler)
diff --git a/solr/core/src/java/org/apache/solr/core/backup/BackupManager.java b/solr/core/src/java/org/apache/solr/core/backup/BackupManager.java
index e193928214a..be6a1a83c2f 100644
--- a/solr/core/src/java/org/apache/solr/core/backup/BackupManager.java
+++ b/solr/core/src/java/org/apache/solr/core/backup/BackupManager.java
@@ -345,6 +345,10 @@ public class BackupManager {
log.debug("Writing file {}", filePath);
// ConfigSetService#downloadFileFromConfig requires '/' in fle path separator
byte[] data = configSetService.downloadFileFromConfig(configName, filePath);
+ // replace empty zk node (data==null) with empty array
+ if (data == null) {
+ data = new byte[0];
+ }
try (OutputStream os = repository.createOutput(uri)) {
os.write(data);
}