From e2050b4d33302cd89ba4166f5951cebaf6f14461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=B0=8F=E5=B9=B3?= Date: Fri, 2 Aug 2024 15:49:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20sonar=20=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20InterruptedException=20=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=A4=84=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../minioplus/s3/official/MinioS3ClientImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/minio-plus-s3-api/s3-api-minio/src/main/java/org/liuxp/minioplus/s3/official/MinioS3ClientImpl.java b/minio-plus-s3-api/s3-api-minio/src/main/java/org/liuxp/minioplus/s3/official/MinioS3ClientImpl.java index e0510ce..9c30b6e 100644 --- a/minio-plus-s3-api/s3-api-minio/src/main/java/org/liuxp/minioplus/s3/official/MinioS3ClientImpl.java +++ b/minio-plus-s3-api/s3-api-minio/src/main/java/org/liuxp/minioplus/s3/official/MinioS3ClientImpl.java @@ -64,7 +64,11 @@ public class MinioS3ClientImpl implements MinioS3Client { try { return this.getClient().bucketExists(BucketExistsArgs.builder().bucket(bucketName).build()).get(); } catch (InsufficientDataException | InternalException | InvalidKeyException | IOException | - NoSuchAlgorithmException | XmlParserException | ExecutionException | InterruptedException e) { + NoSuchAlgorithmException | XmlParserException | ExecutionException e) { + log.error("{}:{}", MinioPlusErrorCode.BUCKET_EXISTS_FAILED.getMessage(), e.getMessage(), e); + throw new MinioPlusException(MinioPlusErrorCode.BUCKET_EXISTS_FAILED); + } catch (InterruptedException e){ + Thread.currentThread().interrupt(); // 重新设置中断状态 log.error("{}:{}", MinioPlusErrorCode.BUCKET_EXISTS_FAILED.getMessage(), e.getMessage(), e); throw new MinioPlusException(MinioPlusErrorCode.BUCKET_EXISTS_FAILED); } @@ -226,9 +230,13 @@ public class MinioS3ClientImpl implements MinioS3Client { .build()); } catch (InsufficientDataException | InternalException | InvalidKeyException | IOException | - NoSuchAlgorithmException | XmlParserException | ExecutionException | InterruptedException e) { + NoSuchAlgorithmException | XmlParserException | ExecutionException e) { log.error(MinioPlusErrorCode.WRITE_FAILED.getMessage(), e); throw new MinioPlusException(MinioPlusErrorCode.WRITE_FAILED); + } catch (InterruptedException e){ + Thread.currentThread().interrupt(); // 重新设置中断状态 + log.error("{}:{}", MinioPlusErrorCode.BUCKET_EXISTS_FAILED.getMessage(), e.getMessage(), e); + throw new MinioPlusException(MinioPlusErrorCode.BUCKET_EXISTS_FAILED); } return true;