Browse Source

Pull request #2: DEC-15615 fix: read方法不能提前关闭,需要调用者在外部使用完之后 及时关闭

Merge in PG2/plugin-repository-s3 from ~ZED/plugin-repository-s3:master to master

* commit 'd55f28224c8f6ba01450965a224275242e271a27':
  DEC-15615 fix: read方法不能提前关闭,需要调用者在外部使用完之后 及时关闭
master
zed 4 years ago
parent
commit
eeb9c97200
  1. 7
      src/main/java/com/fanruan/fs/s3/repository/core/S3ResourceRepository.java

7
src/main/java/com/fanruan/fs/s3/repository/core/S3ResourceRepository.java

@ -121,12 +121,7 @@ public class S3ResourceRepository extends BaseResourceRepository {
public InputStream read(String filePath) throws ResourceIOException {
GetObjectRequest request = new GetObjectRequest(bucket, filePath);
try {
S3Object s3Object = s3.getObject(request);
try {
return s3Object.getObjectContent();
} finally {
s3Object.close();
}
return s3.getObject(request).getObjectContent();
} catch (Exception e) {
return new ByteArrayInputStream(new byte[0]);
}

Loading…
Cancel
Save