summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/filetransfer/util/HashChecker.java
diff options
context:
space:
mode:
authorSimon Rettberg2015-10-02 14:26:58 +0200
committerSimon Rettberg2015-10-02 14:26:58 +0200
commit37f732d50717b572c148547f476ca24f15988aff (patch)
tree45946398c8fa8b186e140b316197caddaedda732 /src/main/java/org/openslx/filetransfer/util/HashChecker.java
parentSupport extracting hw version from vmdk files (diff)
downloadmaster-sync-shared-37f732d50717b572c148547f476ca24f15988aff.tar.gz
master-sync-shared-37f732d50717b572c148547f476ca24f15988aff.tar.xz
master-sync-shared-37f732d50717b572c148547f476ca24f15988aff.zip
Add generic catch block to execCallback so a throwing callback won't wreck havoc
Diffstat (limited to 'src/main/java/org/openslx/filetransfer/util/HashChecker.java')
-rw-r--r--src/main/java/org/openslx/filetransfer/util/HashChecker.java6
1 files changed, 5 insertions, 1 deletions
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