From 9a08efd1d099c92c656c24a8e94de75e23cb5a75 Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Wed, 8 Jul 2015 12:22:17 +0200 Subject: [PATCH] sometimes the worker is null --- .../src/com/jpexs/helpers/CancellableWorker.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/helpers/CancellableWorker.java b/libsrc/ffdec_lib/src/com/jpexs/helpers/CancellableWorker.java index abde1897e..61a15a1c0 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/helpers/CancellableWorker.java +++ b/libsrc/ffdec_lib/src/com/jpexs/helpers/CancellableWorker.java @@ -27,6 +27,8 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.RunnableFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import java.util.logging.Level; +import java.util.logging.Logger; /** * @@ -128,7 +130,11 @@ public abstract class CancellableWorker implements RunnableFuture { List oldWorkers = workers; workers = new ArrayList<>(); for (CancellableWorker worker : oldWorkers) { - worker.cancel(true); + if (worker != null) { + worker.cancel(true); + } else { + Logger.getLogger(CancellableWorker.class.getName()).log(Level.SEVERE, "worker is null"); + } } } }