Apache Solr open-source search software
SOLR-16686: Fix 'bin/solr zk cp' to work with a bare destination filename.
Shawn Heiseybccf03690f55
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex abde885dcee..d249b0ab014 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -34,6 +34,14 @@ Other ChangesPreviously, the modules would come transitively.(David Smiley)+================== 9.3.0 ==================++Bug Fixes+---------------------++* SOLR-16686: Using bin/solr to copy a file from ZK to local fails if the local filename does not have a path.+ (Shawn Heisey)+================== 9.2.0 ==================New Featuresdiff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkMaintenanceUtils.java b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkMaintenanceUtils.javaindex 4b12cbea817..04cadcefbc3 100644--- a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkMaintenanceUtils.java+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkMaintenanceUtils.java@@ -182,7 +182,10 @@ public class ZkMaintenanceUtils {}byte[] data = zkClient.getData(src, null, null, true);Path filename = Paths.get(dst);- Files.createDirectories(filename.getParent());+ Path parentDir = filename.getParent();+ if (parentDir != null) {+ Files.createDirectories(filename.getParent());+ }log.info("Writing file {}", filename);Files.write(filename, data);}