summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java
diff options
context:
space:
mode:
authorSimon Rettberg2016-09-19 11:11:35 +0200
committerSimon Rettberg2016-09-19 11:11:35 +0200
commita575fc223342369b36bb8c7d66feaa2062a5fac5 (patch)
tree514c8bac63c40a652fe227669748990f628fdc11 /dozentenmodul/src/main/java
parent[client] WordWrapLabel: Support '\n' (diff)
downloadtutor-module-a575fc223342369b36bb8c7d66feaa2062a5fac5.tar.gz
tutor-module-a575fc223342369b36bb8c7d66feaa2062a5fac5.tar.xz
tutor-module-a575fc223342369b36bb8c7d66feaa2062a5fac5.zip
[client] PassiveTransfer: Tell if error comes from master or satellite
Diffstat (limited to 'dozentenmodul/src/main/java')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/PassiveTransfer.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/PassiveTransfer.java b/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/PassiveTransfer.java
index a99e60bc..3ec33f49 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/PassiveTransfer.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/PassiveTransfer.java
@@ -92,6 +92,9 @@ public class PassiveTransfer implements TransferEventEmitter {
} catch (TException e) {
error = "Exception quering upload status: " + e.toString();
}
+ if (error != null) {
+ error = queryMaster ? "Master: " : "Satellite: " + error;
+ }
TransferEvent event = new TransferEvent(state, blocks, 0, 0, error);
isCancelled = state == null || state == TransferState.ERROR || state == TransferState.FINISHED;
synchronized (listeners) {