LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-05-31 11:44:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

#776 FFDec stop working at all after setting "number of threads" to 0 fixed

Browse Source
This commit is contained in:
honfika@gmail.com
2015-01-21 12:59:07 +01:00
parent 4afa3c4ac1
commit dfd3166bb9
5 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
View File

@@ -1139,7 +1139,7 @@ public final class SWF implements SWFContainerItem, Timelined {
logger.log(Level.SEVERE, "Error during ABC export", ex);
}
} else {
ExecutorService executor = Executors.newFixedThreadPool(Configuration.parallelThreadCount.get());
ExecutorService executor = Executors.newFixedThreadPool(Configuration.getParallelThreadCount());
List<Future<File>> futureResults = new ArrayList<>();
for (MyEntry<ClassPath, ScriptPack> item : packs) {
Future<File> future = executor.submit(new ExportPackTask(handler, cnt, packs.size(), item.getKey(), item.getValue(), outdir, exportMode, parallel));

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFInputStream.java
View File

@@ -1059,7 +1059,7 @@ public class SWFInputStream implements AutoCloseable {
ExecutorService executor = null;
List<Future<Tag>> futureResults = new ArrayList<>();
if (parallel) {
executor = Executors.newFixedThreadPool(Configuration.parallelThreadCount.get());
executor = Executors.newFixedThreadPool(Configuration.getParallelThreadCount());
futureResults = new ArrayList<>();
}
List<Tag> tags = new ArrayList<>();

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Traits.java
View File

@@ -169,7 +169,7 @@ public class Traits implements Serializable {
task.call();
}
} else {
ExecutorService executor = Executors.newFixedThreadPool(Configuration.parallelThreadCount.get());
ExecutorService executor = Executors.newFixedThreadPool(Configuration.getParallelThreadCount());
List<Future<Void>> futureResults = null;
futureResults = new ArrayList<>();

9
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
View File

@@ -690,6 +690,15 @@ public class Configuration {
return ret;
}
public static int getParallelThreadCount() {
int count = parallelThreadCount.get();
if (count < 2) {
count = 2;
}
return count;
}
public static File getFlashLibPath() {
String home = getFFDecHome();
File libsdir = new File(home + "flashlib");