Revert unrelated changes

apache · Nov 19, 2024 · 4c90bac · 4c90bac
1 parent b94aad1
commit 4c90bac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/solr/core/src/java/org/apache/solr/cli/StreamTool.java b/solr/core/src/java/org/apache/solr/cli/StreamTool.java
@@ -440,7 +440,7 @@ public void setStreamContext(StreamContext context) {
     }
 
     @Override
-    protected List<CrawlFile> validateAndSetFilepathsInSandbox() {
+    protected List<CrawlFile> validateAndSetFilepathsInSandbox(String commaDelimitedFilepaths) {
       final List<CrawlFile> crawlSeeds = new ArrayList<>();
       for (String crawlRootStr : commaDelimitedFilepaths.split(",")) {
         Path crawlRootPath = Paths.get(crawlRootStr).normalize();

diff --git a/solr/core/src/java/org/apache/solr/handler/CatStream.java b/solr/core/src/java/org/apache/solr/handler/CatStream.java
@@ -49,7 +49,7 @@
 public class CatStream extends TupleStream implements Expressible {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
-  protected final String commaDelimitedFilepaths;
+  private final String commaDelimitedFilepaths;
   private final int maxLines; // -1 for no max
 
   private StreamContext context;
@@ -113,7 +113,8 @@ public List<TupleStream> children() {
 
   @Override
   public void open() throws IOException {
-    final List<CrawlFile> initialCrawlSeeds = validateAndSetFilepathsInSandbox();
+    final List<CrawlFile> initialCrawlSeeds =
+        validateAndSetFilepathsInSandbox(this.commaDelimitedFilepaths);
 
     final List<CrawlFile> filesToCrawl = new ArrayList<>();
     for (CrawlFile crawlSeed : initialCrawlSeeds) {
@@ -163,7 +164,7 @@ public Explanation toExplanation(StreamFactory factory) throws IOException {
         .withExpression(toExpression(factory).toString());
   }
 
-  protected List<CrawlFile> validateAndSetFilepathsInSandbox() {
+  protected List<CrawlFile> validateAndSetFilepathsInSandbox(String commaDelimitedFilepaths) {
     final List<CrawlFile> crawlSeeds = new ArrayList<>();
     for (String crawlRootStr : commaDelimitedFilepaths.split(",")) {
       Path crawlRootPath = chroot.resolve(crawlRootStr).normalize();