diff options
author | Simon Rettberg | 2023-09-22 15:39:48 +0200 |
---|---|---|
committer | Simon Rettberg | 2023-09-22 15:39:48 +0200 |
commit | 79a4bdc9eca1635ff036191bb50670f6a51654dc (patch) | |
tree | f6d7696e6479e55dc5a24533bfaac9b8a75559a6 /dozentenmodul/src/main/java/org/openslx/dozmod/thrift/UploadInitiator.java | |
parent | [server] Force update of os, virt and org lists every 3 hours (diff) | |
download | tutor-module-79a4bdc9eca1635ff036191bb50670f6a51654dc.tar.gz tutor-module-79a4bdc9eca1635ff036191bb50670f6a51654dc.tar.xz tutor-module-79a4bdc9eca1635ff036191bb50670f6a51654dc.zip |
[client] Add config option to set transfer type (SSL or plain)
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/thrift/UploadInitiator.java')
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/thrift/UploadInitiator.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/UploadInitiator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/UploadInitiator.java index 78e41d05..5aa36bb1 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/UploadInitiator.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/UploadInitiator.java @@ -165,8 +165,8 @@ public class UploadInitiator { // do actually start the upload now LOGGER.debug("Starting upload for: " + diskFile.getName()); try { - uploadTask = new UploadTask(Session.getSatelliteAddress(), - transferInformation.getPlainPort(), transferInformation.getToken(), diskFile); + uploadTask = new UploadTask(Session.getSatelliteAddress(), transferInformation, + ThriftManager.getSatelliteSslContext(), diskFile); } catch (FileNotFoundException e) { cancelWithGuiErrorMessage("Kann VM nicht hochladen: Datei nicht gefunden\n\n" + diskFile.getAbsolutePath()); |