Might as well handle containsSymLink the same way. Will never matte…

…r for artifact display with either the built-in or pluggable managers, but could improve performance of workspace listing with slow agent connections.
jglick · Jan 17, 2024 · d9abc68 · d9abc68
1 parent da2966a
commit d9abc68
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
@@ -327,7 +327,7 @@ private void serveFile(StaplerRequest req, StaplerResponse rsp, VirtualFile root
                 // serve directory index
                 var result = baseFile.run(new BuildChildPaths(baseFile, req.getLocale(), getOpenOptions()));
                 glob = result.glob;
-                containsSymlink = baseFile.containsSymLinkChild(getOpenOptions());
+                containsSymlink = result.containsSymLink;
                 containsTmpDir = result.containsTmpDir;
             }
 
@@ -751,9 +751,11 @@ private int dirRank(VirtualFile f) {
     private static final class BuildChildPathsResult implements Serializable { // TODO Java 21+ record
         private static final long serialVersionUID = 1;
         private final List<List<Path>> glob;
+        private final boolean containsSymLink;
         private final boolean containsTmpDir;
-        BuildChildPathsResult(List<List<Path>> glob, boolean containsTmpDir) {
+        BuildChildPathsResult(List<List<Path>> glob, boolean containsSymLink, boolean containsTmpDir) {
             this.glob = glob;
+            this.containsSymLink = containsSymLink;
             this.containsTmpDir = containsTmpDir;
         }
     }
@@ -769,7 +771,7 @@ private static final class BuildChildPaths extends MasterToSlaveCallable<BuildCh
         }
 
         @Override public BuildChildPathsResult call() throws IOException {
-            return new BuildChildPathsResult(buildChildPaths(cur, locale), cur.containsTmpDirChild(openOptions));
+            return new BuildChildPathsResult(buildChildPaths(cur, locale), cur.containsSymLinkChild(openOptions), cur.containsTmpDirChild(openOptions));
         }
     }
     /**