--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java Wed Nov 21 22:33:33 2018 -0800
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java Wed Nov 21 22:34:01 2018 -0800
@@ -38,6 +38,7 @@
import java.io.IOException;
import java.io.UncheckedIOException;
+import java.nio.file.Paths;
import java.util.Collections;
import java.util.Deque;
import java.util.HashMap;
@@ -172,7 +173,7 @@
parsedArchives.get(finder).add(archive);
- trace("parsing %s %s%n", archive.getName(), archive.path());
+ trace("parsing %s %s%n", archive.getName(), archive.getPathName());
FutureTask<Set<Location>> task = new FutureTask<>(() -> {
Set<Location> targets = new HashSet<>();
for (ClassFile cf : archive.reader().getClassFiles()) {
@@ -206,7 +207,6 @@
parsedClasses.putIfAbsent(d.getOrigin(), archive);
}
}
-
return targets;
});
tasks.add(task);
@@ -264,8 +264,7 @@
FutureTask<Set<Location>> task;
while ((task = tasks.poll()) != null) {
// wait for completion
- if (!task.isDone())
- targets.addAll(task.get());
+ targets.addAll(task.get());
}
return targets;
} catch (InterruptedException|ExecutionException e) {