Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EPMRPP-80574 || Fix early stream closing #940

Merged
merged 7 commits into from
Oct 20, 2023
Merged

EPMRPP-80574 || Fix early stream closing #940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
08e2ee4
EPMRPP-80519 || Add methods for removing buckets and files
IvanKustau Sep 11, 2023
a65d0b9
EPMRPP-80519 || Remove attachments by project id
IvanKustau Sep 12, 2023
eda6a1b
Merge pull request #931 from reportportal/EPMRPP-80519-project-bucket…
IvanKustau Sep 13, 2023
8e4b91c
EPMRPP-86363 exclude system attributes in launches table widget (#932)
grabsefx Sep 22, 2023
9227d5f
Merge branch 'develop' of https://github.com/reportportal/commons-dao…
pbortnik Oct 12, 2023
1c69b40
Merge branch 'develop' of https://github.com/reportportal/commons-dao…
pbortnik Oct 20, 2023
7a58893
EPMRPP-80574 || Fix early stream closing
pbortnik Oct 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/epam/ta/reportportal/config/EncryptConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ private String getPassword() {
}

private String loadFromDataStore() {
try {
return IOUtils.toString(dataStore.load(secretFilePath), StandardCharsets.UTF_8);
try (InputStream source = dataStore.load(secretFilePath)) {
return IOUtils.toString(source, StandardCharsets.UTF_8);
} catch (IOException e) {
throw new ReportPortalException(ErrorType.UNABLE_TO_LOAD_BINARY_DATA, e.getMessage());
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/epam/ta/reportportal/filesystem/distributed/s3/S3DataStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ public InputStream load(String filePath) {
S3File s3File = getS3File(filePath);
Blob fileBlob = blobStore.getBlob(s3File.getBucket(), s3File.getFilePath());
if (fileBlob != null) {
try (InputStream inputStream = fileBlob.getPayload().openStream()) {
return inputStream;
try {
return fileBlob.getPayload().openStream();
} catch (IOException e) {
throw new ReportPortalException(ErrorType.UNABLE_TO_LOAD_BINARY_DATA, e.getMessage());
}
Expand Down