Skip to content

Commit 574583e

Browse files
authored
fix exception handling for null throwable (#1423)
Signed-off-by: Bala.FA <[email protected]>
1 parent 6016820 commit 574583e

2 files changed

Lines changed: 3 additions & 5 deletions

File tree

api/src/main/java/io/minio/S3Base.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ public void throwEncapsulatedException(ExecutionException e)
240240
| XmlParserException exc) {
241241
throw exc;
242242
} catch (Throwable exc) {
243-
throw new RuntimeException(exc.getCause());
243+
throw new RuntimeException(exc.getCause() == null ? exc : exc.getCause());
244244
}
245245
}
246246

functional/FunctionalTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3849,10 +3849,8 @@ public static Process runMinio(boolean tls) throws Exception {
38493849
env.put("MINIO_ROOT_USER", "minio");
38503850
env.put("MINIO_ROOT_PASSWORD", "minio123");
38513851
env.put("MINIO_CI_CD", "1");
3852-
env.put("MINIO_KMS_KES_ENDPOINT", "https://play.min.io:7373");
3853-
env.put("MINIO_KMS_KES_KEY_FILE", "play.min.io.kes.root.key");
3854-
env.put("MINIO_KMS_KES_CERT_FILE", "play.min.io.kes.root.cert");
3855-
env.put("MINIO_KMS_KES_KEY_NAME", "my-minio-key");
3852+
// echo -n abcdefghijklmnopqrstuvwxyzABCDEF | base64 -
3853+
env.put("MINIO_KMS_SECRET_KEY", "my-minio-key:YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQkNERUY=");
38563854
env.put("MINIO_NOTIFY_WEBHOOK_ENABLE_miniojavatest", "on");
38573855
env.put("MINIO_NOTIFY_WEBHOOK_ENDPOINT_miniojavatest", "http://example.org/");
38583856
sqsArn = "arn:minio:sqs::miniojavatest:webhook";

0 commit comments

Comments
 (0)