From 9e6c90430d4f73e995a64553bfda6710a96bec9f Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Mon, 26 Sep 2016 13:52:25 +1000 Subject: [PATCH] Catch all progress tracker errors --- .../java/com/boydti/fawe/example/DefaultFaweQueueMap.java | 6 +++++- .../main/java/com/boydti/fawe/example/MappedFaweQueue.java | 6 +++++- core/src/main/java/com/boydti/fawe/object/FaweQueue.java | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/com/boydti/fawe/example/DefaultFaweQueueMap.java b/core/src/main/java/com/boydti/fawe/example/DefaultFaweQueueMap.java index 9f44fbde..fef1c661 100644 --- a/core/src/main/java/com/boydti/fawe/example/DefaultFaweQueueMap.java +++ b/core/src/main/java/com/boydti/fawe/example/DefaultFaweQueueMap.java @@ -26,7 +26,11 @@ public class DefaultFaweQueueMap implements IFaweQueueMap { @Override public FaweChunk put(Long key, FaweChunk value) { if (parent.getProgressTask() != null) { - parent.getProgressTask().run(FaweQueue.ProgressType.QUEUE, size() + 1); + try { + parent.getProgressTask().run(FaweQueue.ProgressType.QUEUE, size() + 1); + } catch (Throwable e) { + e.printStackTrace(); + } } return super.put(key, value); } diff --git a/core/src/main/java/com/boydti/fawe/example/MappedFaweQueue.java b/core/src/main/java/com/boydti/fawe/example/MappedFaweQueue.java index 3a9e863d..be86dc20 100644 --- a/core/src/main/java/com/boydti/fawe/example/MappedFaweQueue.java +++ b/core/src/main/java/com/boydti/fawe/example/MappedFaweQueue.java @@ -205,7 +205,11 @@ public abstract class MappedFaweQueue extends FaweQueue { public void runTasks() { super.runTasks(); if (getProgressTask() != null) { - getProgressTask().run(ProgressType.DONE, 1); + try { + getProgressTask().run(ProgressType.DONE, 1); + } catch (Throwable e) { + e.printStackTrace(); + } } ArrayDeque tmp = new ArrayDeque<>(tasks); tasks.clear(); diff --git a/core/src/main/java/com/boydti/fawe/object/FaweQueue.java b/core/src/main/java/com/boydti/fawe/object/FaweQueue.java index 7ea7171d..a52c444f 100644 --- a/core/src/main/java/com/boydti/fawe/object/FaweQueue.java +++ b/core/src/main/java/com/boydti/fawe/object/FaweQueue.java @@ -397,7 +397,11 @@ public abstract class FaweQueue { this.notifyAll(); } if (getProgressTask() != null) { - getProgressTask().run(ProgressType.DONE, 1); + try { + getProgressTask().run(ProgressType.DONE, 1); + } catch (Throwable e) { + e.printStackTrace(); + } } while (!tasks.isEmpty()) { Runnable task = tasks.poll();