From a3360878835e4606c968441e432b0c3d4bd921ae Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Fri, 23 Sep 2022 18:04:07 +0800
Subject: [PATCH] V1.2.0
---
src/main/java/com/dji/sample/component/oss/service/impl/AmazonS3ServiceImpl.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/dji/sample/component/oss/service/impl/AmazonS3ServiceImpl.java b/src/main/java/com/dji/sample/component/oss/service/impl/AmazonS3ServiceImpl.java
index 6d0b8af..f2bcdc5 100644
--- a/src/main/java/com/dji/sample/component/oss/service/impl/AmazonS3ServiceImpl.java
+++ b/src/main/java/com/dji/sample/component/oss/service/impl/AmazonS3ServiceImpl.java
@@ -74,6 +74,10 @@
@Override
public Boolean deleteObject(String bucket, String objectKey) {
AmazonS3 client = this.createClient();
+ if (!client.doesObjectExist(bucket, objectKey)) {
+ client.shutdown();
+ return true;
+ }
client.deleteObject(bucket, objectKey);
client.shutdown();
return true;
@@ -82,18 +86,13 @@
public byte[] getObject(String bucket, String objectKey) {
AmazonS3 client = this.createClient();
S3Object object = client.getObject(bucket, objectKey);
- InputStream stream = object.getObjectContent().getDelegateStream();
- try {
+
+ try (InputStream stream = object.getObjectContent().getDelegateStream()) {
return stream.readAllBytes();
} catch (IOException e) {
e.printStackTrace();
} finally {
- try {
- stream.close();
- client.shutdown();
- } catch (IOException e) {
- e.printStackTrace();
- }
+ client.shutdown();
}
return new byte[0];
}
--
Gitblit v1.9.3