mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git
synced 2026-09-28 09:20:45 +00:00
timeout fixes
This commit is contained in:
@@ -150,6 +150,7 @@ public class ScriptPack implements TreeElementItem {
|
||||
|
||||
public void toSource(GraphTextWriter writer, final List<ABCContainerTag> abcList, final Trait[] traits, final ScriptExportMode exportMode, final boolean parallel) throws InterruptedException {
|
||||
writer.suspendMeasure();
|
||||
int timeout = Configuration.decompilationTimeoutFile.get();
|
||||
try {
|
||||
CancellableWorker.call(new Callable<Void>() {
|
||||
@Override
|
||||
@@ -157,11 +158,11 @@ public class ScriptPack implements TreeElementItem {
|
||||
convert(new NulWriter(), abcList, traits, exportMode, parallel);
|
||||
return null;
|
||||
}
|
||||
}, Configuration.decompilationTimeoutFile.get(), TimeUnit.SECONDS);
|
||||
}, timeout, TimeUnit.SECONDS);
|
||||
} catch (TimeoutException ex) {
|
||||
writer.continueMeasure();
|
||||
Logger.getLogger(MethodBody.class.getName()).log(Level.SEVERE, "Decompilation error", ex);
|
||||
Helper.appendTimeoutComment(writer, Configuration.decompilationTimeoutFile.get());
|
||||
Helper.appendTimeoutComment(writer, timeout);
|
||||
return;
|
||||
} catch (ExecutionException ex) {
|
||||
writer.continueMeasure();
|
||||
|
||||
@@ -178,7 +178,7 @@ public class MethodBody implements Cloneable, Serializable {
|
||||
writer.endMethod();
|
||||
} else if (convertException instanceof TimeoutException) {
|
||||
Logger.getLogger(MethodBody.class.getName()).log(Level.SEVERE, "Decompilation error", convertException);
|
||||
Helper.appendTimeoutComment(writer, Configuration.decompilationTimeoutFile.get());
|
||||
Helper.appendTimeoutComment(writer, timeout);
|
||||
} else {
|
||||
Logger.getLogger(MethodBody.class.getName()).log(Level.SEVERE, "Decompilation error", convertException);
|
||||
Helper.appendErrorComment(writer, convertException);
|
||||
|
||||
@@ -763,7 +763,7 @@ public class Action implements GraphSourceItem {
|
||||
Graph.graphToString(tree, writer, new LocalData());
|
||||
} else if (convertException instanceof TimeoutException) {
|
||||
Logger.getLogger(Action.class.getName()).log(Level.SEVERE, "Decompilation error", convertException);
|
||||
Helper.appendTimeoutComment(writer, Configuration.decompilationTimeoutFile.get());
|
||||
Helper.appendTimeoutComment(writer, timeout);
|
||||
} else {
|
||||
Logger.getLogger(Action.class.getName()).log(Level.SEVERE, "Decompilation error", convertException);
|
||||
Helper.appendErrorComment(writer, convertException);
|
||||
|
||||
Reference in New Issue
Block a user