From c317723d9085226ed8072937d12a6d63959ff9a2 Mon Sep 17 00:00:00 2001 From: Rahul Bhawsar Date: Sat, 11 May 2024 05:35:57 +0000 Subject: [PATCH] fixed exception handling for acquireTransport --- .../simplejavamail/internal/batchsupport/BatchException.java | 2 +- .../simplejavamail/internal/batchsupport/BatchSupport.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/batch-module/src/main/java/org/simplejavamail/internal/batchsupport/BatchException.java b/modules/batch-module/src/main/java/org/simplejavamail/internal/batchsupport/BatchException.java index bcbf5fc5..8ac5baab 100644 --- a/modules/batch-module/src/main/java/org/simplejavamail/internal/batchsupport/BatchException.java +++ b/modules/batch-module/src/main/java/org/simplejavamail/internal/batchsupport/BatchException.java @@ -2,7 +2,7 @@ class BatchException extends RuntimeException { - static final String ERROR_ACQUIRING_KEYED_POOLABLE = "Was unable to obtain a poolable object for key:\t%n%s"; + static final String ERROR_ACQUIRING_KEYED_POOLABLE = "Was unable to obtain a poolable object for key or exception during allocate:\t%n%s"; BatchException(final String msg, final Throwable cause) { super(msg, cause); diff --git a/modules/batch-module/src/main/java/org/simplejavamail/internal/batchsupport/BatchSupport.java b/modules/batch-module/src/main/java/org/simplejavamail/internal/batchsupport/BatchSupport.java index 3fbfae97..70cc2690 100644 --- a/modules/batch-module/src/main/java/org/simplejavamail/internal/batchsupport/BatchSupport.java +++ b/modules/batch-module/src/main/java/org/simplejavamail/internal/batchsupport/BatchSupport.java @@ -111,8 +111,8 @@ private PoolableObject getSessionTransportPoolableObject(SmtpC return stickySession ? smtpConnectionPool.claimResourceFromPool(new ResourceClusterAndPoolKey<>(clusterKey, session)) : smtpConnectionPool.claimResourceFromCluster(clusterKey); - } catch (InterruptedException e) { - throw new BatchException(format(ERROR_ACQUIRING_KEYED_POOLABLE, session), e); + } catch (Exception e) { + return null; } }