Skip to content

Commit 89d68f2

Browse files
authored
Fix RemoteFileSupplier (#3683)
1 parent e61ada5 commit 89d68f2

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/main/java/org/prebid/server/execution/file/supplier/RemoteFileSupplier.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ private Future<Boolean> isSizeChanged() {
9696
private Future<Void> downloadFile() {
9797
return fileSystem.open(tmpPath, new OpenOptions())
9898
.compose(tmpFile -> sendHttpRequest(getRequestOptions)
99-
.compose(response -> response.pipeTo(tmpFile))
100-
.onComplete(result -> tmpFile.close()));
99+
.onFailure(ignored -> tmpFile.close())
100+
.compose(response -> response.pipeTo(tmpFile)));
101101
}
102102

103103
private Future<HttpClientResponse> sendHttpRequest(RequestOptions requestOptions) {

src/test/java/org/prebid/server/execution/file/supplier/RemoteFileSupplierTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ public void getShouldReturnFailureOnNotOkStatusCode() {
125125
final Future<String> result = target.get();
126126

127127
// then
128+
verify(tmpFile).close();
128129
FutureAssertion.assertThat(result).isFailed()
129130
.hasMessage("Got unexpected response from server with status code 204 and message null");
130131
}
@@ -147,7 +148,6 @@ public void getShouldReturnExpectedResult() {
147148
final Future<String> result = target.get();
148149

149150
// then
150-
verify(tmpFile).close();
151151
assertThat(result.result()).isEqualTo(SAVE_PATH);
152152
}
153153

@@ -178,7 +178,6 @@ public void getShouldReturnExpectedResultWhenCheckRemoteFileSizeIsTrue() {
178178
final Future<String> result = target.get();
179179

180180
// then
181-
verify(tmpFile).close();
182181
assertThat(result.result()).isEqualTo(SAVE_PATH);
183182
}
184183

0 commit comments

Comments
 (0)