Improve logging

classgraph · Apr 27, 2020 · 209a976 · 209a976
1 parent be05dcf
commit 209a976
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/main/java/io/github/classgraph/ClasspathElementFileDir.java b/src/main/java/io/github/classgraph/ClasspathElementFileDir.java
@@ -378,6 +378,11 @@ private void scanDirRecursively(final File dir, final LogNode log) {
             return;
         }
 
+        final LogNode subLog = log == null ? null
+                // Log dirs after files (addWhitelistedResources() precedes log entry with "0:")
+                : log.log("1:" + canonicalPath, "Scanning directory: " + dir
+                        + (dir.getPath().equals(canonicalPath) ? "" : " ; canonical path: " + canonicalPath));
+
         final File[] filesInDir = dir.listFiles();
         if (filesInDir == null) {
             if (log != null) {
@@ -386,10 +391,6 @@ private void scanDirRecursively(final File dir, final LogNode log) {
             return;
         }
         Arrays.sort(filesInDir);
-        final LogNode subLog = log == null ? null
-                // Log dirs after files (addWhitelistedResources() precedes log entry with "0:")
-                : log.log("1:" + canonicalPath, "Scanning directory: " + dir
-                        + (dir.getPath().equals(canonicalPath) ? "" : " ; canonical path: " + canonicalPath));
 
         // Determine whether this is a modular jar running under JRE 9+
         final boolean isModularJar = VersionFinder.JAVA_MAJOR_VERSION >= 9 && getModuleName() != null;

diff --git a/src/main/java/io/github/classgraph/ClasspathElementPathDir.java b/src/main/java/io/github/classgraph/ClasspathElementPathDir.java
@@ -391,6 +391,11 @@ private void scanPathRecursively(final Path path, final LogNode log) {
             return;
         }
 
+        final LogNode subLog = log == null ? null
+                // Log dirs after files (addWhitelistedResources() precedes log entry with "0:")
+                : log.log("1:" + canonicalPath, "Scanning Path: " + path
+                        + (path.equals(canonicalPath) ? "" : " ; canonical path: " + canonicalPath));
+
         final List<Path> pathsInDir = new ArrayList<>();
         try (DirectoryStream<Path> stream = Files.newDirectoryStream(path)) {
             for (final Path subPath : stream) {
@@ -405,11 +410,6 @@ private void scanPathRecursively(final Path path, final LogNode log) {
         }
         Collections.sort(pathsInDir);
 
-        final LogNode subLog = log == null ? null
-                // Log dirs after files (addWhitelistedResources() precedes log entry with "0:")
-                : log.log("1:" + canonicalPath, "Scanning Path: " + path
-                        + (path.equals(canonicalPath) ? "" : " ; canonical path: " + canonicalPath));
-
         // Determine whether this is a modular jar running under JRE 9+
         final boolean isModularJar = VersionFinder.JAVA_MAJOR_VERSION >= 9 && getModuleName() != null;