8167014: jdeps: Missing message: warn.skipped.entry

Reviewed-by: alanb, lancea, phh
openjdk · Dec 14, 2021 · 01bd130 · 01bd130
1 parent 9e26d0b
commit 01bd130
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/langtools/src/share/classes/com/sun/tools/jdeps/ClassFileReader.java b/langtools/src/share/classes/com/sun/tools/jdeps/ClassFileReader.java
@@ -337,7 +337,10 @@ public boolean hasNext() {
                     cf = reader.readClassFile(jf, nextEntry);
                     return true;
                 } catch (ClassFileError | IOException ex) {
-                    skippedEntries.add(nextEntry.getName());
+                    skippedEntries.add(String.format("%s: %s (%s)",
+                                                     ex.getMessage(),
+                                                     nextEntry.getName(),
+                                                     jf.getName()));
                 }
                 nextEntry = nextEntry();
             }

diff --git a/langtools/src/share/classes/com/sun/tools/jdeps/JdepsTask.java b/langtools/src/share/classes/com/sun/tools/jdeps/JdepsTask.java
@@ -560,7 +560,7 @@ private void findDependencies() throws IOException {
                     }
                 }
                 for (String name : a.reader().skippedEntries()) {
-                    warning("warn.skipped.entry", name, a.getPathName());
+                    warning("warn.skipped.entry", name);
                 }
             }
         }

diff --git a/langtools/src/share/classes/com/sun/tools/jdeps/resources/jdeps.properties b/langtools/src/share/classes/com/sun/tools/jdeps/resources/jdeps.properties
@@ -92,6 +92,7 @@ err.option.unsupported={0} not supported: {1}
 err.profiles.msg=No profile information
 err.invalid.path=invalid path: {0}
 warn.invalid.arg=Invalid classname or pathname not exist: {0}
+warn.skipped.entry={0}
 warn.split.package=package {0} defined in {1} {2}
 warn.replace.useJDKInternals=\
 JDK internal APIs are unsupported and private to JDK implementation that are\n\
-Original file line number
+Diff line change
@@ Expand Up / @@ -560,7 +560,7 @@ private void findDependencies() throws IOException { @@
                         }
                     }
                     for (String name : a.reader().skippedEntries()) {
-                        warning("warn.skipped.entry", name, a.getPathName());
+                        warning("warn.skipped.entry", name);
                     }
                 }
             }
@@ Expand Down @@