mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-10-16 20:52:08 +08:00
Merge branch 'GP-0_ryanmkurtz_PR-9786_rudycelekli_fix_jar-recursive-cancellation-20261011'
This commit is contained in:
@@ -131,6 +131,9 @@ public class JarWriter {
|
||||
* @return true if all files are recursively output to the jar file.
|
||||
*/
|
||||
public boolean outputRecursively(File baseFile, String jarPath, TaskMonitor monitor) {
|
||||
if (monitor.isCancelled()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
boolean succeeded = true;
|
||||
File[] subFiles = new File[0];
|
||||
@@ -139,7 +142,7 @@ public class JarWriter {
|
||||
subFiles = baseFile.listFiles();
|
||||
for (int i = 0; i < subFiles.length; i++) {
|
||||
if (monitor.isCancelled()) {
|
||||
break;
|
||||
return false;
|
||||
}
|
||||
String newPath = jarPath + baseFile.getName() + File.separator;
|
||||
succeeded = outputRecursively(subFiles[i], newPath, monitor) && succeeded;
|
||||
|
||||
Reference in New Issue
Block a user