From 37f732d50717b572c148547f476ca24f15988aff Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 2 Oct 2015 14:26:58 +0200 Subject: Add generic catch block to execCallback so a throwing callback won't wreck havoc --- src/main/java/org/openslx/filetransfer/util/HashChecker.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/main/java/org/openslx/filetransfer/util/HashChecker.java') diff --git a/src/main/java/org/openslx/filetransfer/util/HashChecker.java b/src/main/java/org/openslx/filetransfer/util/HashChecker.java index c599e2b..8bf97a4 100644 --- a/src/main/java/org/openslx/filetransfer/util/HashChecker.java +++ b/src/main/java/org/openslx/filetransfer/util/HashChecker.java @@ -67,7 +67,11 @@ public class HashChecker private void execCallback( HashTask task, HashResult result ) { - task.callback.hashCheckDone( result, task.data, task.chunk ); + try { + task.callback.hashCheckDone( result, task.data, task.chunk ); + } catch ( Throwable t ) { + LOGGER.warn( "HashCheck callback threw!", t ); + } } public void queue( FileChunk chunk, byte[] data, HashCheckCallback callback ) throws InterruptedException -- cgit v1.2.3-55-g7522