From 73ead92e4cbe084cb12baf00b669503485fbe7ce Mon Sep 17 00:00:00 2001
From: Krzysztof Witukiewicz <krzysztof.witukiewicz@mgm-tp.com>
Date: Mon, 3 Feb 2025 16:52:57 +0100
Subject: [PATCH 1/2] OZG-7262 OZG-7657 Fix possible deadlock
---
.../common/binaryfile/GrpcBinaryFileServerDownloader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/binaryfile/GrpcBinaryFileServerDownloader.java b/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/binaryfile/GrpcBinaryFileServerDownloader.java
index 6083de9..77c2d6f 100644
--- a/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/binaryfile/GrpcBinaryFileServerDownloader.java
+++ b/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/binaryfile/GrpcBinaryFileServerDownloader.java
@@ -107,10 +107,10 @@ public class GrpcBinaryFileServerDownloader<T> {
void startDownload() {
try {
doDownload();
+ closeOutputStream();
sendChunks();
} catch (Exception e) {
downloadError.set(new TechnicalException("Error while downloading file contents", e));
- } finally {
closeOutputStream();
}
}
--
GitLab
From 2ffe246761f4207924a824c25cad823e86c457b9 Mon Sep 17 00:00:00 2001
From: Krzysztof Witukiewicz <krzysztof.witukiewicz@mgm-tp.com>
Date: Tue, 4 Feb 2025 16:19:38 +0100
Subject: [PATCH 2/2] OZG-7262 OZG-7657 Remove second call to sendChunks
---
.../common/binaryfile/GrpcBinaryFileServerDownloader.java | 3 +--
.../binaryfile/GrpcBinaryFileServerDownloaderTest.java | 7 -------
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/binaryfile/GrpcBinaryFileServerDownloader.java b/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/binaryfile/GrpcBinaryFileServerDownloader.java
index 77c2d6f..07379d8 100644
--- a/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/binaryfile/GrpcBinaryFileServerDownloader.java
+++ b/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/binaryfile/GrpcBinaryFileServerDownloader.java
@@ -107,10 +107,9 @@ public class GrpcBinaryFileServerDownloader<T> {
void startDownload() {
try {
doDownload();
- closeOutputStream();
- sendChunks();
} catch (Exception e) {
downloadError.set(new TechnicalException("Error while downloading file contents", e));
+ } finally {
closeOutputStream();
}
}
diff --git a/ozgcloud-common-lib/src/test/java/de/ozgcloud/common/binaryfile/GrpcBinaryFileServerDownloaderTest.java b/ozgcloud-common-lib/src/test/java/de/ozgcloud/common/binaryfile/GrpcBinaryFileServerDownloaderTest.java
index 8c3ad5a..f2f2ef4 100644
--- a/ozgcloud-common-lib/src/test/java/de/ozgcloud/common/binaryfile/GrpcBinaryFileServerDownloaderTest.java
+++ b/ozgcloud-common-lib/src/test/java/de/ozgcloud/common/binaryfile/GrpcBinaryFileServerDownloaderTest.java
@@ -254,13 +254,6 @@ class GrpcBinaryFileServerDownloaderTest {
verify(outputStream).close();
}
-
- @Test
- void shouldSendChunks() {
- downloader.startDownload();
-
- verify(downloader).sendChunks();
- }
}
@Nested
--
GitLab